From 77bf0dd567a0f044ab3e0f3bd9f0cf6ea644547b Mon Sep 17 00:00:00 2001
From: Alexandr Kazachenko <shoom3301@gmail.com>
Date: Tue, 6 Jun 2023 13:13:28 +0600
Subject: [PATCH 01/67] refactor: simplify ParsedOrder interface (#2596)

* refactor: simplify ParsedOrder interface

* fix: fix ParsedOrder namings
---
 src/common/hooks/useGetSurplusFiatValue.ts    |  3 +-
 .../useMultipleOrdersCancellation/index.ts    |  4 +-
 .../useMultipleOrdersCancellation/state.ts    |  7 +--
 .../useCancelMultipleOrders.ts                |  8 +--
 src/common/pure/ExecutedSummary/index.tsx     |  5 +-
 src/common/utils/isOrderCancellable.ts        | 16 +++++-
 .../utils/isOrderOffChainCancellable.ts       |  6 +-
 .../TransactionExecutedContent/index.tsx      |  6 +-
 .../orders/hooks/useTokensFromOrders.ts       | 10 ----
 src/modules/orders/index.ts                   |  1 -
 .../containers/OrdersReceiptModal/hooks.ts    | 24 ++------
 .../containers/OrdersReceiptModal/index.tsx   |  4 +-
 .../hooks/useOrdersTableList.ts               | 10 ++--
 .../hooks/useValidatePageUrlParams.ts         |  8 +--
 .../containers/OrdersTableWidget/index.tsx    | 34 ++++++++----
 .../ordersTable/pure/OrderStatusBox/index.tsx |  6 +-
 .../OrdersTableContainer/OrderRow/index.tsx   |  9 +--
 .../pure/OrdersTableContainer/OrdersTable.tsx | 10 ++--
 .../OrdersTableContainer/index.cosmos.tsx     |  8 +--
 .../pure/OrdersTableContainer/types.ts        | 13 ++---
 .../utils/getOrderParams.ts                   |  5 +-
 .../pure/ReceiptModal/FeeField.tsx            |  5 +-
 .../pure/ReceiptModal/FilledField.tsx         |  6 +-
 .../pure/ReceiptModal/SurplusField.tsx        |  3 +-
 .../ordersTable/pure/ReceiptModal/index.tsx   |  8 +--
 .../ordersTable/state/orderReceiptAtom.ts     |  6 +-
 .../swap/containers/EthFlowStepper/index.tsx  |  4 +-
 src/utils/getExecutedSummaryData.ts           | 13 +++--
 src/utils/orderUtils/getFilledAmounts.ts      | 14 +----
 src/utils/orderUtils/getSellAmountWithFee.ts  |  4 +-
 src/utils/orderUtils/ordersSorter.ts          |  2 +-
 src/utils/orderUtils/parseOrder.ts            | 55 +++++++++++++++----
 32 files changed, 171 insertions(+), 146 deletions(-)
 delete mode 100644 src/modules/orders/hooks/useTokensFromOrders.ts

diff --git a/src/common/hooks/useGetSurplusFiatValue.ts b/src/common/hooks/useGetSurplusFiatValue.ts
index 635b723894..f0c02fcb14 100644
--- a/src/common/hooks/useGetSurplusFiatValue.ts
+++ b/src/common/hooks/useGetSurplusFiatValue.ts
@@ -7,6 +7,7 @@ import { useCoingeckoUsdValue } from 'legacy/hooks/useStablecoinPrice'
 import { Order } from 'legacy/state/orders/actions'
 
 import { getExecutedSummaryData } from 'utils/getExecutedSummaryData'
+import { ParsedOrder } from 'utils/orderUtils/parseOrder'
 
 type Output = {
   surplusFiatValue: CurrencyAmount<Token> | null
@@ -15,7 +16,7 @@ type Output = {
   showFiatValue: boolean
 }
 
-export function useGetSurplusData(order: Order | undefined): Output {
+export function useGetSurplusData(order: Order | ParsedOrder | undefined): Output {
   const { surplusAmount, surplusToken } = useMemo(() => {
     const output: { surplusToken?: Token; surplusAmount?: CurrencyAmount<Token> } = {}
 
diff --git a/src/common/hooks/useMultipleOrdersCancellation/index.ts b/src/common/hooks/useMultipleOrdersCancellation/index.ts
index cfb84f1a93..c7e138ffb8 100644
--- a/src/common/hooks/useMultipleOrdersCancellation/index.ts
+++ b/src/common/hooks/useMultipleOrdersCancellation/index.ts
@@ -3,16 +3,16 @@ import { useCallback } from 'react'
 
 import { useOpenModal } from 'legacy/state/application/hooks'
 import { ApplicationModal } from 'legacy/state/application/reducer'
-import { Order } from 'legacy/state/orders/actions'
 
 import { updateOrdersToCancelAtom } from 'common/hooks/useMultipleOrdersCancellation/state'
+import { CancellableOrder } from 'common/utils/isOrderCancellable'
 
 export function useMultipleOrdersCancellation() {
   const setOrdersToCancel = useUpdateAtom(updateOrdersToCancelAtom)
   const openModal = useOpenModal(ApplicationModal.MULTIPLE_CANCELLATION)
 
   return useCallback(
-    (orders: Order[]) => {
+    (orders: CancellableOrder[]) => {
       setOrdersToCancel(orders)
       openModal()
     },
diff --git a/src/common/hooks/useMultipleOrdersCancellation/state.ts b/src/common/hooks/useMultipleOrdersCancellation/state.ts
index 108fbd396d..b952802988 100644
--- a/src/common/hooks/useMultipleOrdersCancellation/state.ts
+++ b/src/common/hooks/useMultipleOrdersCancellation/state.ts
@@ -1,12 +1,11 @@
 import { atom } from 'jotai'
 
-import { Order } from 'legacy/state/orders/actions'
-
+import { CancellableOrder } from 'common/utils/isOrderCancellable'
 import { isOrderOffChainCancellable } from 'common/utils/isOrderOffChainCancellable'
 
-export const ordersToCancelAtom = atom<Order[]>([])
+export const ordersToCancelAtom = atom<CancellableOrder[]>([])
 
-export const updateOrdersToCancelAtom = atom(null, (get, set, nextState: Order[]) => {
+export const updateOrdersToCancelAtom = atom(null, (get, set, nextState: CancellableOrder[]) => {
   set(ordersToCancelAtom, () => {
     return nextState.filter(isOrderOffChainCancellable)
   })
diff --git a/src/common/hooks/useMultipleOrdersCancellation/useCancelMultipleOrders.ts b/src/common/hooks/useMultipleOrdersCancellation/useCancelMultipleOrders.ts
index 0d82512170..20a14be3d1 100644
--- a/src/common/hooks/useMultipleOrdersCancellation/useCancelMultipleOrders.ts
+++ b/src/common/hooks/useMultipleOrdersCancellation/useCancelMultipleOrders.ts
@@ -5,18 +5,16 @@ import { useWeb3React } from '@web3-react/core'
 
 import { orderBookApi } from 'cowSdk'
 
-import { Order } from 'legacy/state/orders/actions'
-
 import { useWalletInfo } from 'modules/wallet'
 
-import { isOrderCancellable } from 'common/utils/isOrderCancellable'
+import { CancellableOrder, isOrderCancellable } from 'common/utils/isOrderCancellable'
 
-export function useCancelMultipleOrders(): (orders: Order[]) => Promise<void> {
+export function useCancelMultipleOrders(): (orders: CancellableOrder[]) => Promise<void> {
   const { provider } = useWeb3React()
   const { chainId } = useWalletInfo()
 
   return useCallback(
-    async (ordersToCancel: Order[]) => {
+    async (ordersToCancel: CancellableOrder[]) => {
       const notCancellableOrders = ordersToCancel.filter((order) => !isOrderCancellable(order))
       const signer = provider?.getSigner()
 
diff --git a/src/common/pure/ExecutedSummary/index.tsx b/src/common/pure/ExecutedSummary/index.tsx
index 1179690b00..1b1536b39d 100644
--- a/src/common/pure/ExecutedSummary/index.tsx
+++ b/src/common/pure/ExecutedSummary/index.tsx
@@ -1,11 +1,10 @@
-import { Order } from 'legacy/state/orders/actions'
-
 import { useGetSurplusData } from 'common/hooks/useGetSurplusFiatValue'
 import { getExecutedSummaryData } from 'utils/getExecutedSummaryData'
+import { ParsedOrder } from 'utils/orderUtils/parseOrder'
 
 import * as styledEl from './styled'
 
-export function ExecutedSummary({ order }: { order: Order }) {
+export function ExecutedSummary({ order }: { order: ParsedOrder }) {
   const { formattedFilledAmount, formattedSwappedAmount } = getExecutedSummaryData(order)
   const { surplusFiatValue, showFiatValue, surplusToken, surplusAmount } = useGetSurplusData(order)
 
diff --git a/src/common/utils/isOrderCancellable.ts b/src/common/utils/isOrderCancellable.ts
index 3ceecd78bf..ffea261f1c 100644
--- a/src/common/utils/isOrderCancellable.ts
+++ b/src/common/utils/isOrderCancellable.ts
@@ -1,11 +1,21 @@
-import { Order, OrderStatus } from 'legacy/state/orders/actions'
+import { Token } from '@uniswap/sdk-core'
+
+import { OrderStatus } from 'legacy/state/orders/actions'
+
+export interface CancellableOrder {
+  id: string
+  inputToken: Token
+  isCancelling?: boolean
+  cancellationHash?: string
+  status: OrderStatus
+}
 
 // 1. An order can be cancelled when the order is CREATING or PENDING
 // 2. It cannot be cancelled if there's a cancellationHash already or a cancellation in progress
-export function isOrderCancellable(order: Order): boolean {
+export function isOrderCancellable(order: CancellableOrder): boolean {
   if (order.isCancelling || order.cancellationHash) {
     return false
   }
 
-  return [OrderStatus.CREATING, OrderStatus.PENDING].includes(order?.status)
+  return [OrderStatus.CREATING, OrderStatus.PENDING].includes(order.status)
 }
diff --git a/src/common/utils/isOrderOffChainCancellable.ts b/src/common/utils/isOrderOffChainCancellable.ts
index 2ecc1ab8ec..edd7870f24 100644
--- a/src/common/utils/isOrderOffChainCancellable.ts
+++ b/src/common/utils/isOrderOffChainCancellable.ts
@@ -1,9 +1,7 @@
-import { Order } from 'legacy/state/orders/actions'
-
 import { getIsEthFlowOrder } from 'modules/swap/containers/EthFlowStepper'
 
-import { isOrderCancellable } from 'common/utils/isOrderCancellable'
+import { CancellableOrder, isOrderCancellable } from 'common/utils/isOrderCancellable'
 
-export function isOrderOffChainCancellable(order: Order): boolean {
+export function isOrderOffChainCancellable(order: CancellableOrder): boolean {
   return !getIsEthFlowOrder(order) && isOrderCancellable(order)
 }
diff --git a/src/legacy/components/TransactionExecutedContent/index.tsx b/src/legacy/components/TransactionExecutedContent/index.tsx
index 5492ca1500..5f351f8b59 100644
--- a/src/legacy/components/TransactionExecutedContent/index.tsx
+++ b/src/legacy/components/TransactionExecutedContent/index.tsx
@@ -6,6 +6,7 @@ import { Order } from 'legacy/state/orders/actions'
 
 import { useGetSurplusData } from 'common/hooks/useGetSurplusFiatValue'
 import { getExecutedSummaryData } from 'utils/getExecutedSummaryData'
+import { parseOrder } from 'utils/orderUtils/parseOrder'
 
 import * as styledEl from './styled'
 
@@ -18,8 +19,9 @@ export function TransactionExecutedContent({
   chainId: SupportedChainId
   hash?: string
 }) {
-  const { formattedFilledAmount, formattedSwappedAmount } = getExecutedSummaryData(order)
-  const { surplusFiatValue, showFiatValue, surplusToken, surplusAmount } = useGetSurplusData(order)
+  const parsedOrder = parseOrder(order)
+  const { formattedFilledAmount, formattedSwappedAmount } = getExecutedSummaryData(parsedOrder)
+  const { surplusFiatValue, showFiatValue, surplusToken, surplusAmount } = useGetSurplusData(parsedOrder)
 
   return (
     <styledEl.ExecutedWrapper>
diff --git a/src/modules/orders/hooks/useTokensFromOrders.ts b/src/modules/orders/hooks/useTokensFromOrders.ts
deleted file mode 100644
index 7ab38c40b3..0000000000
--- a/src/modules/orders/hooks/useTokensFromOrders.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { useMemo } from 'react'
-
-import { Order } from 'modules/orders'
-
-export function useInputTokensFromOrders(orders: Order[]) {
-  return useMemo(() => {
-    return orders.map((order) => order.inputToken)
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [orders.map((order) => order.sellToken).join('')])
-}
diff --git a/src/modules/orders/index.ts b/src/modules/orders/index.ts
index f967c9dffe..c9f6f047dc 100644
--- a/src/modules/orders/index.ts
+++ b/src/modules/orders/index.ts
@@ -1,2 +1 @@
 export * from './types'
-export * from './hooks/useTokensFromOrders'
diff --git a/src/modules/ordersTable/containers/OrdersReceiptModal/hooks.ts b/src/modules/ordersTable/containers/OrdersReceiptModal/hooks.ts
index 0e7bf0fa90..e87670b5b4 100644
--- a/src/modules/ordersTable/containers/OrdersReceiptModal/hooks.ts
+++ b/src/modules/ordersTable/containers/OrdersReceiptModal/hooks.ts
@@ -1,34 +1,22 @@
 import { useUpdateAtom, useAtomValue } from 'jotai/utils'
-import { useCallback, useMemo } from 'react'
+import { useCallback } from 'react'
 
-import { UID } from '@cowprotocol/cow-sdk'
-
-import { useOrdersTableList } from 'modules/ordersTable/containers/OrdersTableWidget/hooks/useOrdersTableList'
 import { updateReceiptAtom, receiptAtom } from 'modules/ordersTable/state/orderReceiptAtom'
 
 import { ParsedOrder } from 'utils/orderUtils/parseOrder'
 
 export function useCloseReceiptModal() {
   const updateReceiptState = useUpdateAtom(updateReceiptAtom)
-  return useCallback(() => updateReceiptState({ orderId: null }), [updateReceiptState])
+  return useCallback(() => updateReceiptState({ order: null }), [updateReceiptState])
 }
 
-export function useSelectReceiptOrder(): (orderId: UID) => void {
+export function useSelectReceiptOrder(): (order: ParsedOrder) => void {
   const updateReceiptState = useUpdateAtom(updateReceiptAtom)
-  return useCallback((orderId: UID) => updateReceiptState({ orderId }), [updateReceiptState])
+  return useCallback((order: ParsedOrder) => updateReceiptState({ order }), [updateReceiptState])
 }
 
 export function useSelectedOrder(): ParsedOrder | null {
-  const { orderId } = useAtomValue(receiptAtom)
-  const orders = useOrdersTableList()
-
-  return useMemo(() => {
-    if (!orderId || !orders) {
-      return null
-    }
-
-    const allOrders = Object.values(orders).flat()
+  const { order } = useAtomValue(receiptAtom)
 
-    return allOrders.find(({ id }) => id === orderId) || null
-  }, [orderId, orders])
+  return order
 }
diff --git a/src/modules/ordersTable/containers/OrdersReceiptModal/index.tsx b/src/modules/ordersTable/containers/OrdersReceiptModal/index.tsx
index d320be55cb..e82d3125b9 100644
--- a/src/modules/ordersTable/containers/OrdersReceiptModal/index.tsx
+++ b/src/modules/ordersTable/containers/OrdersReceiptModal/index.tsx
@@ -27,8 +27,8 @@ export function OrdersReceiptModal(props: OrdersReceiptModalProps) {
     return null
   }
 
-  const { inputToken, outputToken, buyAmount, sellAmount, executedBuyAmount, executedSellAmount } = order
-
+  const { inputToken, outputToken, buyAmount, sellAmount } = order
+  const { executedBuyAmount, executedSellAmount } = order.executionData
   // Sell and buy amounts
   const sellAmountCurrency = CurrencyAmount.fromRawAmount(inputToken, sellAmount.toString())
   const buyAmountCurrency = CurrencyAmount.fromRawAmount(outputToken, buyAmount.toString())
diff --git a/src/modules/ordersTable/containers/OrdersTableWidget/hooks/useOrdersTableList.ts b/src/modules/ordersTable/containers/OrdersTableWidget/hooks/useOrdersTableList.ts
index 328e94d7d8..0c3bf5567b 100644
--- a/src/modules/ordersTable/containers/OrdersTableWidget/hooks/useOrdersTableList.ts
+++ b/src/modules/ordersTable/containers/OrdersTableWidget/hooks/useOrdersTableList.ts
@@ -1,7 +1,6 @@
 import { useCallback, useMemo } from 'react'
 
 import { Order, PENDING_STATES } from 'legacy/state/orders/actions'
-import { useOrders } from 'legacy/state/orders/hooks'
 
 import { useWalletInfo } from 'modules/wallet'
 
@@ -15,9 +14,8 @@ export interface OrdersTableList {
 
 const ORDERS_LIMIT = 100
 
-export function useOrdersTableList(): OrdersTableList {
-  const { chainId, account } = useWalletInfo()
-  const allNonEmptyOrders = useOrders({ chainId })
+export function useOrdersTableList(allOrders: Order[]): OrdersTableList {
+  const { account } = useWalletInfo()
   const accountLowerCase = account?.toLowerCase()
 
   const ordersFilter = useCallback(
@@ -26,8 +24,8 @@ export function useOrdersTableList(): OrdersTableList {
   )
 
   const allSortedOrders = useMemo(() => {
-    return allNonEmptyOrders.filter(ordersFilter).map(parseOrder).sort(ordersSorter)
-  }, [allNonEmptyOrders, ordersFilter])
+    return allOrders.filter(ordersFilter).map(parseOrder).sort(ordersSorter)
+  }, [allOrders, ordersFilter])
 
   return useMemo(() => {
     const { pending, history } = allSortedOrders.reduce(
diff --git a/src/modules/ordersTable/containers/OrdersTableWidget/hooks/useValidatePageUrlParams.ts b/src/modules/ordersTable/containers/OrdersTableWidget/hooks/useValidatePageUrlParams.ts
index 87f83c477a..66585c4b1a 100644
--- a/src/modules/ordersTable/containers/OrdersTableWidget/hooks/useValidatePageUrlParams.ts
+++ b/src/modules/ordersTable/containers/OrdersTableWidget/hooks/useValidatePageUrlParams.ts
@@ -2,18 +2,16 @@ import { useLayoutEffect } from 'react'
 
 import { useLocation, useNavigate } from 'react-router-dom'
 
-import { Order } from 'legacy/state/orders/actions'
-
 import { ORDERS_TABLE_PAGE_SIZE } from '../../../const/tabs'
 import { buildOrdersTableUrl, parseOrdersTableUrl } from '../../../utils/buildOrdersTableUrl'
 
 // Reset page params if they are invalid
-export function useValidatePageUrlParams(orders: Order[], currentTabId: string, currentPageNumber: number) {
+export function useValidatePageUrlParams(ordersLength: number, currentTabId: string, currentPageNumber: number) {
   const location = useLocation()
   const navigate = useNavigate()
 
   useLayoutEffect(() => {
-    const pagesCount = Math.ceil(orders.length / ORDERS_TABLE_PAGE_SIZE)
+    const pagesCount = Math.ceil(ordersLength / ORDERS_TABLE_PAGE_SIZE)
     const params = parseOrdersTableUrl(location.search)
 
     const shouldResetPageNumber =
@@ -31,5 +29,5 @@ export function useValidatePageUrlParams(orders: Order[], currentTabId: string,
         { replace: true }
       )
     }
-  }, [navigate, location, currentTabId, currentPageNumber, orders.length])
+  }, [navigate, location, currentTabId, currentPageNumber, ordersLength])
 }
diff --git a/src/modules/ordersTable/containers/OrdersTableWidget/index.tsx b/src/modules/ordersTable/containers/OrdersTableWidget/index.tsx
index 2dd4282a6d..7a101ea651 100644
--- a/src/modules/ordersTable/containers/OrdersTableWidget/index.tsx
+++ b/src/modules/ordersTable/containers/OrdersTableWidget/index.tsx
@@ -5,9 +5,8 @@ import { useLocation, useNavigate } from 'react-router-dom'
 import styled from 'styled-components/macro'
 
 import { GP_VAULT_RELAYER } from 'legacy/constants'
-import { Order } from 'legacy/state/orders/actions'
+import { useOrders } from 'legacy/state/orders/hooks'
 
-import { useInputTokensFromOrders } from 'modules/orders'
 import { pendingOrdersPricesAtom } from 'modules/orders/state/pendingOrdersPricesAtom'
 import { useGetSpotPrice } from 'modules/orders/state/spotPricesAtom'
 import { ORDERS_TABLE_TABS, OPEN_TAB } from 'modules/ordersTable/const/tabs'
@@ -21,6 +20,7 @@ import { useWalletDetails, useWalletInfo } from 'modules/wallet'
 
 import { useCancelOrder } from 'common/hooks/useCancelOrder'
 import { ordersToCancelAtom, updateOrdersToCancelAtom } from 'common/hooks/useMultipleOrdersCancellation/state'
+import { CancellableOrder } from 'common/utils/isOrderCancellable'
 import { ParsedOrder } from 'utils/orderUtils/parseOrder'
 
 import { OrdersTableList, useOrdersTableList } from './hooks/useOrdersTableList'
@@ -32,7 +32,7 @@ function getOrdersListByIndex(ordersList: OrdersTableList, id: string): ParsedOr
   return id === OPEN_TAB.id ? ordersList.pending : ordersList.history
 }
 
-function toggleOrderInCancellationList(state: Order[], order: Order): Order[] {
+function toggleOrderInCancellationList(state: CancellableOrder[], order: CancellableOrder): CancellableOrder[] {
   const isOrderIncluded = state.find((item) => item.id === order.id)
 
   if (isOrderIncluded) {
@@ -47,11 +47,12 @@ const ContentWrapper = styled.div`
 `
 
 export function OrdersTableWidget() {
+  const { chainId, account } = useWalletInfo()
   const location = useLocation()
   const navigate = useNavigate()
-  const ordersList = useOrdersTableList()
-  const { chainId, account } = useWalletInfo()
-  const getShowCancellationModal = useCancelOrder()
+  const allOrders = useOrders({ chainId })
+  const ordersList = useOrdersTableList(allOrders)
+  const cancelOrder = useCancelOrder()
   const { allowsOffchainSigning } = useWalletDetails()
   const pendingOrdersPrices = useAtomValue(pendingOrdersPricesAtom)
   const ordersToCancel = useAtomValue(ordersToCancelAtom)
@@ -83,25 +84,38 @@ export function OrdersTableWidget() {
   const isOpenOrdersTab = useMemo(() => OPEN_TAB.id === currentTabId, [currentTabId])
 
   // Get tokens from pending orders (only if the OPEN orders tab is opened)
-  const tokens = useInputTokensFromOrders(isOpenOrdersTab ? ordersList.pending : [])
+  const tokens = useMemo(() => {
+    const pendingOrders = isOpenOrdersTab ? ordersList.pending : []
+
+    return pendingOrders.map((order) => order.inputToken)
+  }, [isOpenOrdersTab, ordersList.pending])
 
   // Get effective balance
   const balancesAndAllowances = useBalancesAndAllowances({ account, spender, tokens })
 
   const toggleOrdersForCancellation = useCallback(
-    (orders: Order[]) => {
+    (orders: ParsedOrder[]) => {
       updateOrdersToCancel(orders)
     },
     [updateOrdersToCancel]
   )
 
   const toggleOrderForCancellation = useCallback(
-    (order: Order) => {
+    (order: ParsedOrder) => {
       updateOrdersToCancel(toggleOrderInCancellationList(ordersToCancel, order))
     },
     [ordersToCancel, updateOrdersToCancel]
   )
 
+  const getShowCancellationModal = useCallback(
+    (order: ParsedOrder) => {
+      const rawOrder = allOrders.find((item) => item.id === order.id)
+
+      return rawOrder ? cancelOrder(rawOrder) : null
+    },
+    [allOrders, cancelOrder]
+  )
+
   const orderActions: LimitOrderActions = {
     getShowCancellationModal,
     selectReceiptOrder,
@@ -114,7 +128,7 @@ export function OrdersTableWidget() {
     navigate(buildOrdersTableUrl(location, { pageNumber: currentPageNumber, tabId: currentTabId }), { replace: true })
   }, []) // eslint-disable-line react-hooks/exhaustive-deps
 
-  useValidatePageUrlParams(orders, currentTabId, currentPageNumber)
+  useValidatePageUrlParams(orders.length, currentTabId, currentPageNumber)
 
   return (
     <>
diff --git a/src/modules/ordersTable/pure/OrderStatusBox/index.tsx b/src/modules/ordersTable/pure/OrderStatusBox/index.tsx
index b12a2aadd3..ce0df2e3af 100644
--- a/src/modules/ordersTable/pure/OrderStatusBox/index.tsx
+++ b/src/modules/ordersTable/pure/OrderStatusBox/index.tsx
@@ -71,7 +71,7 @@ export function OrderStatusBox({ order, widthAuto, withWarning, onClick }: Order
   return (
     <Wrapper
       cancelling={order.isCancelling}
-      partiallyFilled={order.partiallyFilled}
+      partiallyFilled={order.executionData.partiallyFilled}
       status={order.status}
       widthAuto={widthAuto}
       withWarning={withWarning}
@@ -88,10 +88,10 @@ export function OrderStatusBox({ order, widthAuto, withWarning, onClick }: Order
           ? orderStatusTitleMap[order.status]
           : // We consider the order fully filled for display purposes even if not 100% filled
           // For this reason we use the flag to override the order status
-          order.fullyFilled
+          order.executionData.fullyFilled
           ? orderStatusTitleMap[OrderStatus.FULFILLED]
           : // Partially filled is also not a real status
-          order.partiallyFilled
+          order.executionData.partiallyFilled
           ? 'Partially Filled'
           : orderStatusTitleMap[order.status] // Finally, map order status to their display version
       }
diff --git a/src/modules/ordersTable/pure/OrdersTableContainer/OrderRow/index.tsx b/src/modules/ordersTable/pure/OrdersTableContainer/OrderRow/index.tsx
index 42a7ec5105..c34e929ba5 100644
--- a/src/modules/ordersTable/pure/OrdersTableContainer/OrderRow/index.tsx
+++ b/src/modules/ordersTable/pure/OrdersTableContainer/OrderRow/index.tsx
@@ -133,7 +133,8 @@ export function OrderRow({
   spotPrice,
 }: OrderRowProps) {
   const { buyAmount, rateInfoParams, hasEnoughAllowance, hasEnoughBalance, chainId } = orderParams
-  const { parsedCreationTime, expirationTime, activityId, formattedPercentage, executedPrice, status } = order
+  const { creationTime, expirationTime, status } = order
+  const { filledPercentDisplay, executedPrice, activityId } = order.executionData
   const { inputCurrencyAmount, outputCurrencyAmount } = rateInfoParams
   const { estimatedExecutionPrice, feeAmount } = prices || {}
 
@@ -146,7 +147,7 @@ export function OrderRow({
   const theme = useContext(ThemeContext)
 
   const expirationTimeAgo = useTimeAgo(expirationTime, TIME_AGO_UPDATE_INTERVAL)
-  const creationTimeAgo = useTimeAgo(parsedCreationTime, TIME_AGO_UPDATE_INTERVAL)
+  const creationTimeAgo = useTimeAgo(creationTime, TIME_AGO_UPDATE_INTERVAL)
   // TODO: set the real value when API returns it
   // const executedTimeAgo = useTimeAgo(expirationTime, TIME_AGO_UPDATE_INTERVAL)
   const activityUrl = chainId && activityId ? getEtherscanLink(chainId, activityId, 'transaction') : undefined
@@ -290,8 +291,8 @@ export function OrderRow({
 
       {/* Filled % */}
       <styledEl.CellElement doubleRow clickable onClick={onClick}>
-        <b>{formattedPercentage}%</b>
-        <styledEl.ProgressBar value={formattedPercentage}></styledEl.ProgressBar>
+        <b>{filledPercentDisplay}%</b>
+        <styledEl.ProgressBar value={filledPercentDisplay}></styledEl.ProgressBar>
       </styledEl.CellElement>
 
       {/* Status label */}
diff --git a/src/modules/ordersTable/pure/OrdersTableContainer/OrdersTable.tsx b/src/modules/ordersTable/pure/OrdersTableContainer/OrdersTable.tsx
index 0bff42f7d3..fca133bd5b 100644
--- a/src/modules/ordersTable/pure/OrdersTableContainer/OrdersTable.tsx
+++ b/src/modules/ordersTable/pure/OrdersTableContainer/OrdersTable.tsx
@@ -12,7 +12,6 @@ import styled from 'styled-components/macro'
 import iconOrderExecution from 'legacy/assets/cow-swap/orderExecution.svg'
 import { QuestionWrapper } from 'legacy/components/QuestionHelper'
 import QuestionHelper from 'legacy/components/QuestionHelper'
-import { Order } from 'legacy/state/orders/actions'
 
 import { PendingOrdersPrices } from 'modules/orders/state/pendingOrdersPricesAtom'
 import { SpotPricesKeyParams } from 'modules/orders/state/spotPricesAtom'
@@ -28,6 +27,7 @@ import { BalancesAndAllowances } from 'modules/tokens'
 
 import { OrderExecutionStatusList, RateTooltipHeader } from 'common/pure/OrderExecutionStatusList'
 import { InvertRateControl } from 'common/pure/RateInfo'
+import { CancellableOrder } from 'common/utils/isOrderCancellable'
 import { isOrderOffChainCancellable } from 'common/utils/isOrderOffChainCancellable'
 import { ordersTableFeatures } from 'constants/featureFlags'
 import { ordersSorter } from 'utils/orderUtils/ordersSorter'
@@ -193,7 +193,7 @@ export interface OrdersTableProps {
   chainId: SupportedChainId | undefined
   pendingOrdersPrices: PendingOrdersPrices
   orders: ParsedOrder[]
-  selectedOrders: Order[]
+  selectedOrders: CancellableOrder[]
   balancesAndAllowances: BalancesAndAllowances
   getSpotPrice: (params: SpotPricesKeyParams) => Price<Currency, Currency> | null
   orderActions: LimitOrderActions
@@ -389,14 +389,14 @@ export function OrdersTable({
                 order={order}
                 spotPrice={getSpotPrice({
                   chainId: chainId as SupportedChainId,
-                  sellTokenAddress: order.sellToken,
-                  buyTokenAddress: order.buyToken,
+                  sellTokenAddress: order.inputToken.address,
+                  buyTokenAddress: order.outputToken.address,
                 })}
                 prices={pendingOrdersPrices[order.id]}
                 orderParams={getOrderParams(chainId, balancesAndAllowances, order)}
                 isRateInverted={isRateInverted}
                 orderActions={orderActions}
-                onClick={() => orderActions.selectReceiptOrder(order.id)}
+                onClick={() => orderActions.selectReceiptOrder(order)}
               />
             ))}
           </Rows>
diff --git a/src/modules/ordersTable/pure/OrdersTableContainer/index.cosmos.tsx b/src/modules/ordersTable/pure/OrdersTableContainer/index.cosmos.tsx
index 187d3a8101..99e05de110 100644
--- a/src/modules/ordersTable/pure/OrdersTableContainer/index.cosmos.tsx
+++ b/src/modules/ordersTable/pure/OrdersTableContainer/index.cosmos.tsx
@@ -1,8 +1,8 @@
-import { UID } from '@cowprotocol/cow-sdk'
-
 import { LimitOrderActions } from 'modules/ordersTable/pure/OrdersTableContainer/types'
 import { BalancesAndAllowances } from 'modules/tokens'
 
+import { ParsedOrder } from 'utils/orderUtils/parseOrder'
+
 import { ordersMock } from './orders.mock'
 
 import { OrdersTableContainer } from './index'
@@ -37,8 +37,8 @@ const orderActions: LimitOrderActions = {
     }
     return null
   },
-  selectReceiptOrder(orderUid: UID) {
-    console.log('selectReceiptOrder', orderUid)
+  selectReceiptOrder(order: ParsedOrder) {
+    console.log('selectReceiptOrder', order)
   },
   toggleOrderForCancellation(order) {
     console.log('toggleOrderForCancellation', order)
diff --git a/src/modules/ordersTable/pure/OrdersTableContainer/types.ts b/src/modules/ordersTable/pure/OrdersTableContainer/types.ts
index 9ac9117a90..72a438a2c3 100644
--- a/src/modules/ordersTable/pure/OrdersTableContainer/types.ts
+++ b/src/modules/ordersTable/pure/OrdersTableContainer/types.ts
@@ -1,12 +1,9 @@
-import { UID } from '@cowprotocol/cow-sdk'
-
-import { Order } from 'legacy/state/orders/actions'
-
 import { UseCancelOrderReturn } from 'common/hooks/useCancelOrder'
+import { ParsedOrder } from 'utils/orderUtils/parseOrder'
 
 export interface LimitOrderActions {
-  getShowCancellationModal: (order: Order) => UseCancelOrderReturn
-  selectReceiptOrder(orderId: UID): void
-  toggleOrderForCancellation(order: Order): void
-  toggleOrdersForCancellation(orders: Order[]): void
+  getShowCancellationModal: (order: ParsedOrder) => UseCancelOrderReturn
+  selectReceiptOrder(order: ParsedOrder): void
+  toggleOrderForCancellation(order: ParsedOrder): void
+  toggleOrdersForCancellation(orders: ParsedOrder[]): void
 }
diff --git a/src/modules/ordersTable/pure/OrdersTableContainer/utils/getOrderParams.ts b/src/modules/ordersTable/pure/OrdersTableContainer/utils/getOrderParams.ts
index 6d2aa58f96..ff97c09181 100644
--- a/src/modules/ordersTable/pure/OrdersTableContainer/utils/getOrderParams.ts
+++ b/src/modules/ordersTable/pure/OrdersTableContainer/utils/getOrderParams.ts
@@ -1,12 +1,11 @@
 import { SupportedChainId } from '@cowprotocol/cow-sdk'
 import { Currency, CurrencyAmount, Percent } from '@uniswap/sdk-core'
 
-import { Order } from 'legacy/state/orders/actions'
-
 import { BalancesAndAllowances } from 'modules/tokens'
 
 import { RateInfoParams } from 'common/pure/RateInfo'
 import { isEnoughAmount } from 'utils/isEnoughAmount'
+import { ParsedOrder } from 'utils/orderUtils/parseOrder'
 
 export interface OrderParams {
   chainId: SupportedChainId | undefined
@@ -22,7 +21,7 @@ const PERCENTAGE_FOR_PARTIAL_FILLS = new Percent(5, 10000) // 0.05%
 export function getOrderParams(
   chainId: SupportedChainId | undefined,
   balancesAndAllowances: BalancesAndAllowances,
-  order: Order
+  order: ParsedOrder
 ): OrderParams {
   const sellAmount = CurrencyAmount.fromRawAmount(order.inputToken, order.sellAmount.toString())
   const buyAmount = CurrencyAmount.fromRawAmount(order.outputToken, order.buyAmount.toString())
diff --git a/src/modules/ordersTable/pure/ReceiptModal/FeeField.tsx b/src/modules/ordersTable/pure/ReceiptModal/FeeField.tsx
index 68c463a37e..7786024f61 100644
--- a/src/modules/ordersTable/pure/ReceiptModal/FeeField.tsx
+++ b/src/modules/ordersTable/pure/ReceiptModal/FeeField.tsx
@@ -8,9 +8,10 @@ import * as styledEl from './styled'
 export type Props = { order: ParsedOrder }
 
 export function FeeField({ order }: Props): JSX.Element | null {
-  const { executedFeeAmount, executedSurplusFee, inputToken, sellToken } = order
+  const { inputToken } = order
+  const { executedFeeAmount, executedSurplusFee } = order.executionData
 
-  if (!sellToken) return <styledEl.Value></styledEl.Value>
+  if (!inputToken) return <styledEl.Value></styledEl.Value>
 
   // TODO: use the value from SDK
   const totalFee = CurrencyAmount.fromRawAmount(inputToken, (executedSurplusFee ?? executedFeeAmount) || 0)
diff --git a/src/modules/ordersTable/pure/ReceiptModal/FilledField.tsx b/src/modules/ordersTable/pure/ReceiptModal/FilledField.tsx
index 73a2cba721..b9ac819eb3 100644
--- a/src/modules/ordersTable/pure/ReceiptModal/FilledField.tsx
+++ b/src/modules/ordersTable/pure/ReceiptModal/FilledField.tsx
@@ -11,7 +11,9 @@ interface Props {
 }
 
 export function FilledField({ order }: Props) {
-  const { filledPercentage, formattedPercentage, fullyFilled } = order
+  const {
+    executionData: { filledPercentage, filledPercentDisplay, fullyFilled },
+  } = order
   const { action, mainAmount, formattedFilledAmount, formattedSwappedAmount } = getFilledAmounts(order)
 
   const touched = filledPercentage?.gt(0)
@@ -19,7 +21,7 @@ export function FilledField({ order }: Props) {
   return (
     <styledEl.Value>
       <styledEl.InlineWrapper>
-        <styledEl.Progress active={formattedPercentage || 0} />
+        <styledEl.Progress active={filledPercentDisplay || 0} />
       </styledEl.InlineWrapper>
 
       <styledEl.InlineWrapper>
diff --git a/src/modules/ordersTable/pure/ReceiptModal/SurplusField.tsx b/src/modules/ordersTable/pure/ReceiptModal/SurplusField.tsx
index 5be423be58..7cd1495a1b 100644
--- a/src/modules/ordersTable/pure/ReceiptModal/SurplusField.tsx
+++ b/src/modules/ordersTable/pure/ReceiptModal/SurplusField.tsx
@@ -11,7 +11,8 @@ interface Props {
 }
 
 export function SurplusField({ order }: Props) {
-  const { kind, inputToken, outputToken, surplusAmount, surplusPercentage } = order
+  const { kind, inputToken, outputToken } = order
+  const { surplusAmount, surplusPercentage } = order.executionData
 
   const surplusToken = kind === OrderKind.SELL ? outputToken : inputToken
 
diff --git a/src/modules/ordersTable/pure/ReceiptModal/index.tsx b/src/modules/ordersTable/pure/ReceiptModal/index.tsx
index 94d8878663..928ba9def9 100644
--- a/src/modules/ordersTable/pure/ReceiptModal/index.tsx
+++ b/src/modules/ordersTable/pure/ReceiptModal/index.tsx
@@ -131,7 +131,7 @@ export function ReceiptModal({
 
             <styledEl.Field>
               <FieldLabel label="Created" tooltip={tooltips.CREATED} />
-              <DateField date={order.parsedCreationTime} />
+              <DateField date={order.creationTime} />
             </styledEl.Field>
 
             <styledEl.Field>
@@ -145,10 +145,10 @@ export function ReceiptModal({
             </styledEl.Field>
 
             <styledEl.Field>
-              {order.activityId && (
+              {order.executionData.activityId && (
                 <>
-                  <FieldLabel label={order.activityTitle} />
-                  <IdField id={order.activityId} chainId={chainId} />
+                  <FieldLabel label={order.executionData.activityTitle} />
+                  <IdField id={order.executionData.activityId} chainId={chainId} />
                 </>
               )}
             </styledEl.Field>
diff --git a/src/modules/ordersTable/state/orderReceiptAtom.ts b/src/modules/ordersTable/state/orderReceiptAtom.ts
index 573d3677e4..0784f76dd8 100644
--- a/src/modules/ordersTable/state/orderReceiptAtom.ts
+++ b/src/modules/ordersTable/state/orderReceiptAtom.ts
@@ -1,11 +1,13 @@
 import { atom } from 'jotai'
 
+import { ParsedOrder } from 'utils/orderUtils/parseOrder'
+
 export interface ReceiptState {
-  orderId: string | null
+  order: ParsedOrder | null
 }
 
 export const receiptAtom = atom<ReceiptState>({
-  orderId: null,
+  order: null,
 })
 
 export const updateReceiptAtom = atom(null, (get, set, nextState: Partial<ReceiptState>) => {
diff --git a/src/modules/swap/containers/EthFlowStepper/index.tsx b/src/modules/swap/containers/EthFlowStepper/index.tsx
index a6447a61e6..47ff95c0f7 100644
--- a/src/modules/swap/containers/EthFlowStepper/index.tsx
+++ b/src/modules/swap/containers/EthFlowStepper/index.tsx
@@ -1,3 +1,5 @@
+import { Token } from '@uniswap/sdk-core'
+
 import { NATIVE_CURRENCY_BUY_ADDRESS } from 'legacy/constants'
 import { useAllTransactions } from 'legacy/state/enhancedTransactions/hooks'
 import { EnhancedTransactionDetails } from 'legacy/state/enhancedTransactions/reducer'
@@ -117,6 +119,6 @@ function didRefundFail(order: Order): boolean | undefined {
 }
 
 // TODO: move this somewhere else?
-export function getIsEthFlowOrder(order: Order | undefined): boolean {
+export function getIsEthFlowOrder(order: { inputToken: Token } | undefined): boolean {
   return order?.inputToken.address === NATIVE_CURRENCY_BUY_ADDRESS
 }
diff --git a/src/utils/getExecutedSummaryData.ts b/src/utils/getExecutedSummaryData.ts
index 387ecec2d4..2f4ca2f423 100644
--- a/src/utils/getExecutedSummaryData.ts
+++ b/src/utils/getExecutedSummaryData.ts
@@ -5,12 +5,17 @@ import { Order } from 'legacy/state/orders/actions'
 
 import { getFilledAmounts } from 'utils/orderUtils/getFilledAmounts'
 
-import { parseOrder } from './orderUtils/parseOrder'
+import { ParsedOrder, parseOrder } from './orderUtils/parseOrder'
 
-export function getExecutedSummaryData(order: Order) {
-  const parsedOrder = parseOrder(order)
+function isParsedOrder(order: Order | ParsedOrder): order is ParsedOrder {
+  return !!(order as ParsedOrder).executionData
+}
+
+export function getExecutedSummaryData(order: Order | ParsedOrder) {
+  const parsedOrder = isParsedOrder(order) ? order : parseOrder(order)
 
-  const { inputToken, outputToken, surplusAmount: amount, surplusPercentage: percentage } = parsedOrder
+  const { inputToken, outputToken } = parsedOrder
+  const { surplusAmount: amount, surplusPercentage: percentage } = parsedOrder.executionData
 
   const parsedInputToken = new Token(
     inputToken.chainId,
diff --git a/src/utils/orderUtils/getFilledAmounts.ts b/src/utils/orderUtils/getFilledAmounts.ts
index a129cf8fd2..05a848c871 100644
--- a/src/utils/orderUtils/getFilledAmounts.ts
+++ b/src/utils/orderUtils/getFilledAmounts.ts
@@ -13,18 +13,8 @@ function legacyBigNumberToCurrencyAmount(currency: Token, value: BigNumber | und
 }
 
 export function getFilledAmounts(order: ParsedOrder) {
-  const {
-    inputToken,
-    outputToken,
-    kind,
-    feeAmount,
-    executedBuyAmount,
-    executedSellAmount,
-    executedFeeAmount,
-    filledAmount,
-    sellAmount,
-    buyAmount,
-  } = order
+  const { inputToken, outputToken, kind, feeAmount, sellAmount, buyAmount } = order
+  const { executedBuyAmount, executedSellAmount, executedFeeAmount, filledAmount } = order.executionData
 
   let mainToken: Token
   let mainAmount: CurrencyAmount<Token>
diff --git a/src/utils/orderUtils/getSellAmountWithFee.ts b/src/utils/orderUtils/getSellAmountWithFee.ts
index dd6fe54c9d..bab9434b16 100644
--- a/src/utils/orderUtils/getSellAmountWithFee.ts
+++ b/src/utils/orderUtils/getSellAmountWithFee.ts
@@ -1,8 +1,8 @@
 import { CurrencyAmount, Token } from '@uniswap/sdk-core'
 
-import { Order } from 'legacy/state/orders/actions'
+import { ParsedOrder } from './parseOrder'
 
-export function getSellAmountWithFee(order: Order): CurrencyAmount<Token> {
+export function getSellAmountWithFee(order: ParsedOrder): CurrencyAmount<Token> {
   const feeAmountParsed = CurrencyAmount.fromRawAmount(order.inputToken, order.feeAmount.toString())
   const sellAmountParsed = CurrencyAmount.fromRawAmount(order.inputToken, order.sellAmount.toString())
   return sellAmountParsed.add(feeAmountParsed)
diff --git a/src/utils/orderUtils/ordersSorter.ts b/src/utils/orderUtils/ordersSorter.ts
index df7460cda1..883153280d 100644
--- a/src/utils/orderUtils/ordersSorter.ts
+++ b/src/utils/orderUtils/ordersSorter.ts
@@ -1,3 +1,3 @@
 import { ParsedOrder } from './parseOrder'
 
-export const ordersSorter = (a: ParsedOrder, b: ParsedOrder) => Date.parse(b.creationTime) - Date.parse(a.creationTime)
+export const ordersSorter = (a: ParsedOrder, b: ParsedOrder) => b.creationTime.getTime() - a.creationTime.getTime()
diff --git a/src/utils/orderUtils/parseOrder.ts b/src/utils/orderUtils/parseOrder.ts
index d6254ea6bb..8a249c25af 100644
--- a/src/utils/orderUtils/parseOrder.ts
+++ b/src/utils/orderUtils/parseOrder.ts
@@ -1,4 +1,5 @@
-import { Currency, CurrencyAmount, Price } from '@uniswap/sdk-core'
+import { OrderClass, OrderKind } from '@cowprotocol/cow-sdk'
+import { Currency, CurrencyAmount, Price, Token } from '@uniswap/sdk-core'
 
 import BigNumber from 'bignumber.js'
 import JSBI from 'jsbi'
@@ -11,10 +12,9 @@ import { getOrderSurplus } from './getOrderSurplus'
 import { isOrderFilled } from './isOrderFilled'
 import { isPartiallyFilled } from './isPartiallyFilled'
 
-export interface ParsedOrder extends Order {
+export interface ParsedOrderExecutionData {
   executedBuyAmount: JSBI
   executedSellAmount: JSBI
-  expirationTime: Date
   fullyFilled: boolean
   partiallyFilled: boolean
   filledAmount: BigNumber
@@ -23,13 +23,30 @@ export interface ParsedOrder extends Order {
   surplusPercentage: BigNumber
   executedFeeAmount: string | undefined
   executedSurplusFee: string | null
-  formattedPercentage: number
-  parsedCreationTime: Date
+  filledPercentDisplay: number
   executedPrice: Price<Currency, Currency> | null
   activityId: string | undefined
   activityTitle: string
 }
 
+export interface ParsedOrder {
+  id: string
+  isCancelling: boolean | undefined
+  inputToken: Token
+  outputToken: Token
+  kind: OrderKind
+  sellAmount: string
+  buyAmount: string
+  feeAmount: string
+  class: OrderClass
+  status: OrderStatus
+  partiallyFillable: boolean
+  creationTime: Date
+  expirationTime: Date
+
+  executionData: ParsedOrderExecutionData
+}
+
 export const parseOrder = (order: Order): ParsedOrder => {
   const { amount: filledAmount, percentage: filledPercentage } = getOrderFilledAmount(order)
   const { amount: surplusAmount, percentage: surplusPercentage } = getOrderSurplus(order)
@@ -37,10 +54,10 @@ export const parseOrder = (order: Order): ParsedOrder => {
   const expirationTime = new Date(Number(order.validTo) * 1000)
   const executedFeeAmount = order.apiAdditionalInfo?.executedFeeAmount
   const executedSurplusFee = order.apiAdditionalInfo?.executedSurplusFee || null
-  const parsedCreationTime = new Date(order.creationTime)
+  const creationTime = new Date(order.creationTime)
   const fullyFilled = isOrderFilled(order)
   const partiallyFilled = isPartiallyFilled(order)
-  const formattedPercentage = filledPercentage.times(100).decimalPlaces(2).toNumber()
+  const filledPercentDisplay = filledPercentage.times(100).decimalPlaces(2).toNumber()
   const executedPrice = JSBI.greaterThan(executedBuyAmount, JSBI.BigInt(0))
     ? new Price({
         baseAmount: CurrencyAmount.fromRawAmount(order.inputToken, executedSellAmount),
@@ -54,23 +71,37 @@ export const parseOrder = (order: Order): ParsedOrder => {
   const activityId = showCreationTxLink ? order.orderCreationHash : order.id
   const activityTitle = showCreationTxLink ? 'Creation transaction' : 'Order ID'
 
-  return {
-    ...order,
-    expirationTime,
+  const executionData: ParsedOrderExecutionData = {
     executedBuyAmount,
     executedSellAmount,
     filledAmount,
     filledPercentage,
-    formattedPercentage,
+    filledPercentDisplay,
     surplusAmount,
     surplusPercentage,
     executedFeeAmount,
     executedSurplusFee,
     executedPrice,
-    parsedCreationTime,
     fullyFilled,
     partiallyFilled,
     activityId,
     activityTitle,
   }
+
+  return {
+    id: order.id,
+    isCancelling: order.isCancelling,
+    inputToken: order.inputToken,
+    outputToken: order.outputToken,
+    kind: order.kind,
+    sellAmount: order.sellAmount,
+    buyAmount: order.buyAmount,
+    feeAmount: order.feeAmount,
+    class: order.class,
+    status: order.status,
+    partiallyFillable: order.partiallyFillable,
+    creationTime,
+    expirationTime,
+    executionData,
+  }
 }

From 9493f111f88ad8020013ba57afd9ee87ca52cb2a Mon Sep 17 00:00:00 2001
From: Alexandr Kazachenko <shoom3301@gmail.com>
Date: Tue, 6 Jun 2023 14:00:39 +0600
Subject: [PATCH 02/67] feat(trade-form-validation): service to validate
 generic trade widget behaviour (#2590)

---
 .../integration/limit-orders.test.ts          |   2 +-
 .../TradeApprove/useTradeApproveState.ts      |   4 +-
 src/common/hooks/useApproveState.ts           |   6 +-
 .../pure/TradeLoadingButton/index.cosmos.tsx  |   0
 .../pure/TradeLoadingButton/index.tsx         |   0
 src/legacy/hooks/useTokenAllowance.ts         |   8 +-
 .../containers/AdvancedOrdersWidget/index.tsx |   3 +-
 .../containers/LimitOrdersWarnings/index.tsx  |  32 ++-
 .../containers/TradeButtons/index.tsx         |  97 ++++-----
 .../limitOrdersTradeButtonsMap.tsx            | 200 +----------------
 .../hooks/useLimitOrdersFormState.ts          | 202 +++---------------
 src/modules/limitOrders/index.ts              |   1 +
 src/modules/swap/pure/SwapButtons/styled.tsx  |   2 +-
 src/modules/trade/index.ts                    |   1 +
 .../hooks/useGetTradeFormValidation.ts        |  15 ++
 .../hooks/useTradeFormValidationContext.ts    |  56 +++++
 src/modules/tradeFormValidation/index.ts      |   5 +
 .../pure/TradeFormBlankButton/index.tsx       |  65 ++++++
 .../pure/TradeFormButtons/index.tsx           |  46 ++++
 .../pure/TradeFormButtons/tradeButtonsMap.tsx | 146 +++++++++++++
 .../services/validateTradeForm.ts             |  94 ++++++++
 .../state/tradeFormValidationAtom.ts          |  13 ++
 .../state/tradeFormValidationContextAtom.ts   |   5 +
 src/modules/tradeFormValidation/types.ts      |  68 ++++++
 .../updaters/TradeFormValidationUpdater.ts    |  22 ++
 .../tradeQuote/hooks/useTradeQuotePolling.ts  |   4 +-
 src/pages/LimitOrders/index.tsx               |   4 +
 27 files changed, 652 insertions(+), 449 deletions(-)
 rename src/{modules/trade => common}/pure/TradeLoadingButton/index.cosmos.tsx (100%)
 rename src/{modules/trade => common}/pure/TradeLoadingButton/index.tsx (100%)
 create mode 100644 src/modules/tradeFormValidation/hooks/useGetTradeFormValidation.ts
 create mode 100644 src/modules/tradeFormValidation/hooks/useTradeFormValidationContext.ts
 create mode 100644 src/modules/tradeFormValidation/index.ts
 create mode 100644 src/modules/tradeFormValidation/pure/TradeFormBlankButton/index.tsx
 create mode 100644 src/modules/tradeFormValidation/pure/TradeFormButtons/index.tsx
 create mode 100644 src/modules/tradeFormValidation/pure/TradeFormButtons/tradeButtonsMap.tsx
 create mode 100644 src/modules/tradeFormValidation/services/validateTradeForm.ts
 create mode 100644 src/modules/tradeFormValidation/state/tradeFormValidationAtom.ts
 create mode 100644 src/modules/tradeFormValidation/state/tradeFormValidationContextAtom.ts
 create mode 100644 src/modules/tradeFormValidation/types.ts
 create mode 100644 src/modules/tradeFormValidation/updaters/TradeFormValidationUpdater.ts

diff --git a/cypress-custom/integration/limit-orders.test.ts b/cypress-custom/integration/limit-orders.test.ts
index f5d93148c2..fc5fb137ef 100644
--- a/cypress-custom/integration/limit-orders.test.ts
+++ b/cypress-custom/integration/limit-orders.test.ts
@@ -13,7 +13,7 @@ describe('Limit orders', () => {
 
     cy.get('#input-currency-input .token-amount-input').type(inputAmount.toString())
     cy.get('#rate-limit-amount-input').clear().type(rate.toString(), { force: true })
-    cy.get('#review-limit-order-btn').click()
+    cy.get('#do-trade-button').click()
 
     cy.get('#output-currency-input .token-amount-input').should('have.value', outputAmount.toString())
     cy.get('#trade-confirmation #input-currency-preview .token-amount-input').should(
diff --git a/src/common/containers/TradeApprove/useTradeApproveState.ts b/src/common/containers/TradeApprove/useTradeApproveState.ts
index 780385d8cb..99ddf1469a 100644
--- a/src/common/containers/TradeApprove/useTradeApproveState.ts
+++ b/src/common/containers/TradeApprove/useTradeApproveState.ts
@@ -1,11 +1,13 @@
 import { Currency, CurrencyAmount } from '@uniswap/sdk-core'
 
+import { Nullish } from 'types'
+
 import { ApprovalState } from 'legacy/hooks/useApproveCallback'
 
 import { useApproveState } from 'common/hooks/useApproveState'
 import { useTradeSpenderAddress } from 'common/hooks/useTradeSpenderAddress'
 
-export function useTradeApproveState(amountToApprove: CurrencyAmount<Currency> | null): ApprovalState {
+export function useTradeApproveState(amountToApprove: Nullish<CurrencyAmount<Currency>>): ApprovalState {
   const spender = useTradeSpenderAddress()
 
   return useApproveState(amountToApprove, spender)
diff --git a/src/common/hooks/useApproveState.ts b/src/common/hooks/useApproveState.ts
index 5ee9883605..0fded7d3a5 100644
--- a/src/common/hooks/useApproveState.ts
+++ b/src/common/hooks/useApproveState.ts
@@ -2,6 +2,8 @@ import { useMemo } from 'react'
 
 import { Currency, CurrencyAmount, Token } from '@uniswap/sdk-core'
 
+import { Nullish } from 'types'
+
 import { ApprovalState } from 'legacy/hooks/useApproveCallback'
 import usePrevious from 'legacy/hooks/usePrevious'
 import { useTokenAllowance } from 'legacy/hooks/useTokenAllowance'
@@ -11,7 +13,7 @@ import { useWalletInfo } from 'modules/wallet'
 
 import { useSafeMemo } from 'common/hooks/useSafeMemo'
 
-function getCurrencyToApprove(amountToApprove: CurrencyAmount<Currency> | null): Token | undefined {
+function getCurrencyToApprove(amountToApprove: Nullish<CurrencyAmount<Currency>>): Token | undefined {
   if (!amountToApprove) return undefined
 
   if (amountToApprove.currency.isNative) return amountToApprove.currency.wrapped
@@ -19,7 +21,7 @@ function getCurrencyToApprove(amountToApprove: CurrencyAmount<Currency> | null):
   return amountToApprove.currency
 }
 
-export function useApproveState(amountToApprove: CurrencyAmount<Currency> | null, spender?: string): ApprovalState {
+export function useApproveState(amountToApprove: Nullish<CurrencyAmount<Currency>>, spender?: string): ApprovalState {
   const { account } = useWalletInfo()
   const token = getCurrencyToApprove(amountToApprove)
   const currentAllowance = useTokenAllowance(token, account ?? undefined, spender)
diff --git a/src/modules/trade/pure/TradeLoadingButton/index.cosmos.tsx b/src/common/pure/TradeLoadingButton/index.cosmos.tsx
similarity index 100%
rename from src/modules/trade/pure/TradeLoadingButton/index.cosmos.tsx
rename to src/common/pure/TradeLoadingButton/index.cosmos.tsx
diff --git a/src/modules/trade/pure/TradeLoadingButton/index.tsx b/src/common/pure/TradeLoadingButton/index.tsx
similarity index 100%
rename from src/modules/trade/pure/TradeLoadingButton/index.tsx
rename to src/common/pure/TradeLoadingButton/index.tsx
diff --git a/src/legacy/hooks/useTokenAllowance.ts b/src/legacy/hooks/useTokenAllowance.ts
index a8db22cb0f..673d35f939 100644
--- a/src/legacy/hooks/useTokenAllowance.ts
+++ b/src/legacy/hooks/useTokenAllowance.ts
@@ -2,11 +2,17 @@ import { useMemo } from 'react'
 
 import { CurrencyAmount, Token } from '@uniswap/sdk-core'
 
+import { Nullish } from 'types'
+
 import { useSingleCallResult } from 'lib/hooks/multicall'
 
 import { useTokenContract } from './useContract'
 
-export function useTokenAllowance(token?: Token, owner?: string, spender?: string): CurrencyAmount<Token> | undefined {
+export function useTokenAllowance(
+  token: Nullish<Token>,
+  owner?: string,
+  spender?: string
+): CurrencyAmount<Token> | undefined {
   const contract = useTokenContract(token?.address, false)
 
   const inputs = useMemo(() => [owner, spender], [owner, spender])
diff --git a/src/modules/advancedOrders/containers/AdvancedOrdersWidget/index.tsx b/src/modules/advancedOrders/containers/AdvancedOrdersWidget/index.tsx
index 7c8a0feeeb..ae4af32d5c 100644
--- a/src/modules/advancedOrders/containers/AdvancedOrdersWidget/index.tsx
+++ b/src/modules/advancedOrders/containers/AdvancedOrdersWidget/index.tsx
@@ -12,11 +12,10 @@ import {
 import { useSetupTradeState, TradeWidget, TradeWidgetSlots } from 'modules/trade'
 import { useTradeQuote, useSetTradeQuoteParams } from 'modules/tradeQuote'
 import { TwapFormWidget } from 'modules/twap'
+import { partsStateAtom } from 'modules/twap/state/partsStateAtom'
 
 import { CurrencyInfo } from 'common/pure/CurrencyInputPanel/types'
 
-import { partsStateAtom } from '../../../twap/state/partsStateAtom'
-
 export function AdvancedOrdersWidget() {
   useSetupTradeState()
   useFillAdvancedOrdersDerivedState()
diff --git a/src/modules/limitOrders/containers/LimitOrdersWarnings/index.tsx b/src/modules/limitOrders/containers/LimitOrdersWarnings/index.tsx
index 8babc7cfe9..4729b9a17c 100644
--- a/src/modules/limitOrders/containers/LimitOrdersWarnings/index.tsx
+++ b/src/modules/limitOrders/containers/LimitOrdersWarnings/index.tsx
@@ -10,7 +10,7 @@ import { Nullish } from 'types'
 import { PriceImpact } from 'legacy/hooks/usePriceImpact'
 
 import { useLimitOrdersDerivedState } from 'modules/limitOrders/hooks/useLimitOrdersDerivedState'
-import { LimitOrdersFormState, useLimitOrdersFormState } from 'modules/limitOrders/hooks/useLimitOrdersFormState'
+import { useLimitOrdersFormState } from 'modules/limitOrders/hooks/useLimitOrdersFormState'
 import { useRateImpact } from 'modules/limitOrders/hooks/useRateImpact'
 import { limitOrdersSettingsAtom } from 'modules/limitOrders/state/limitOrdersSettingsAtom'
 import {
@@ -18,6 +18,8 @@ import {
   updateLimitOrdersWarningsAtom,
 } from 'modules/limitOrders/state/limitOrdersWarningsAtom'
 import { NoImpactWarning } from 'modules/trade/pure/NoImpactWarning'
+import { TradeFormValidation, useGetTradeFormValidation } from 'modules/tradeFormValidation'
+import { useTradeQuote } from 'modules/tradeQuote'
 import { useIsSafeViaWc, useWalletInfo } from 'modules/wallet'
 
 import { useShouldZeroApprove } from 'common/hooks/useShouldZeroApprove'
@@ -33,10 +35,7 @@ import { calculatePercentageInRelationToReference } from 'utils/orderUtils/calcu
 
 import { RateImpactWarning } from '../../pure/RateImpactWarning'
 
-const FORM_STATES_TO_SHOW_BUNDLE_BANNER = [
-  LimitOrdersFormState.ExpertApproveAndSwap,
-  LimitOrdersFormState.ApproveAndSwap,
-]
+const FORM_STATES_TO_SHOW_BUNDLE_BANNER = [TradeFormValidation.ExpertApproveAndSwap, TradeFormValidation.ApproveAndSwap]
 
 export interface LimitOrdersWarningsProps {
   priceImpact: PriceImpact
@@ -59,26 +58,39 @@ export function LimitOrdersWarnings(props: LimitOrdersWarningsProps) {
   const updateLimitOrdersWarnings = useSetAtom(updateLimitOrdersWarningsAtom)
   const { expertMode } = useAtomValue(limitOrdersSettingsAtom)
 
-  const formState = useLimitOrdersFormState()
+  const localFormValidation = useLimitOrdersFormState()
+  const primaryFormValidation = useGetTradeFormValidation()
   const rateImpact = useRateImpact()
   const { chainId, account } = useWalletInfo()
   const { slippageAdjustedSellAmount, inputCurrency, inputCurrencyAmount, outputCurrency, outputCurrencyAmount } =
     useLimitOrdersDerivedState()
+  const tradeQuote = useTradeQuote()
 
+  const canTrade = localFormValidation === null && primaryFormValidation === null && !tradeQuote.error
   const showPriceImpactWarning =
-    !!chainId && !expertMode && !!account && !!priceImpact.error && formState === LimitOrdersFormState.CanTrade
+    canTrade && !tradeQuote.isLoading && !!chainId && !expertMode && !!account && !!priceImpact.error
+  const showRateImpactWarning =
+    canTrade &&
+    !tradeQuote.isLoading &&
+    inputCurrency &&
+    !isFractionFalsy(inputCurrencyAmount) &&
+    !isFractionFalsy(outputCurrencyAmount)
 
   const feePercentage = calculatePercentageInRelationToReference({ value: feeAmount, reference: inputCurrencyAmount })
 
   const showHighFeeWarning = feePercentage?.greaterThan(HIGH_FEE_WARNING_PERCENTAGE)
 
-  const showApprovalBundlingBanner = !isConfirmScreen && FORM_STATES_TO_SHOW_BUNDLE_BANNER.includes(formState)
+  const showApprovalBundlingBanner =
+    !isConfirmScreen && primaryFormValidation && FORM_STATES_TO_SHOW_BUNDLE_BANNER.includes(primaryFormValidation)
   const shouldZeroApprove = useShouldZeroApprove(slippageAdjustedSellAmount)
   const showZeroApprovalWarning = shouldZeroApprove && outputCurrency !== null // Show warning only when output currency is also present.
 
   const isSafeViaWc = useIsSafeViaWc()
   const showSafeWcBundlingBanner =
-    !isConfirmScreen && !showApprovalBundlingBanner && isSafeViaWc && formState === LimitOrdersFormState.NotApproved
+    !isConfirmScreen &&
+    !showApprovalBundlingBanner &&
+    isSafeViaWc &&
+    primaryFormValidation === TradeFormValidation.ApproveRequired
 
   const isVisible =
     showPriceImpactWarning ||
@@ -120,7 +132,7 @@ export function LimitOrdersWarnings(props: LimitOrdersWarningsProps) {
           acceptCallback={onAcceptPriceImpact}
         />
       )}
-      {inputCurrency && !isFractionFalsy(inputCurrencyAmount) && !isFractionFalsy(outputCurrencyAmount) && (
+      {showRateImpactWarning && (
         <StyledRateImpactWarning
           withAcknowledge={isConfirmScreen}
           isAccepted={isRateImpactAccepted}
diff --git a/src/modules/limitOrders/containers/TradeButtons/index.tsx b/src/modules/limitOrders/containers/TradeButtons/index.tsx
index 91e70db6e0..05a447b1a4 100644
--- a/src/modules/limitOrders/containers/TradeButtons/index.tsx
+++ b/src/modules/limitOrders/containers/TradeButtons/index.tsx
@@ -1,34 +1,30 @@
 import { useAtomValue } from 'jotai/utils'
-import React, { useCallback } from 'react'
+import React from 'react'
 
 import { Trans } from '@lingui/macro'
-import styled from 'styled-components/macro'
 
 import { PriceImpact } from 'legacy/hooks/usePriceImpact'
-import { useWrapCallback } from 'legacy/hooks/useWrapCallback'
-import { useCloseModals, useModalIsOpen, useToggleWalletModal } from 'legacy/state/application/hooks'
-import { ApplicationModal } from 'legacy/state/application/reducer'
+import { useToggleWalletModal } from 'legacy/state/application/hooks'
 
 import { useHandleOrderPlacement } from 'modules/limitOrders/hooks/useHandleOrderPlacement'
 import { useLimitOrdersDerivedState } from 'modules/limitOrders/hooks/useLimitOrdersDerivedState'
 import { useLimitOrdersWarningsAccepted } from 'modules/limitOrders/hooks/useLimitOrdersWarningsAccepted'
 import { TradeFlowContext } from 'modules/limitOrders/services/types'
 import { limitOrdersSettingsAtom } from 'modules/limitOrders/state/limitOrdersSettingsAtom'
-import { isUnsupportedTokenInQuote } from 'modules/limitOrders/utils/isUnsupportedTokenInQuote'
-import { transactionConfirmAtom } from 'modules/swap/state/transactionConfirmAtom'
 import { useTradeConfirmActions } from 'modules/trade/hooks/useTradeConfirmActions'
-import { CompatibilityIssuesWarning } from 'modules/trade/pure/CompatibilityIssuesWarning'
+import {
+  TradeFormButtons,
+  useGetTradeFormValidation,
+  TradeFormBlankButton,
+  TradeFormButtonContext,
+} from 'modules/tradeFormValidation'
 import { useTradeQuote } from 'modules/tradeQuote'
 import { useWalletDetails } from 'modules/wallet'
 
-import { limitOrdersTradeButtonsMap, SwapButton, WrapUnwrapParams } from './limitOrdersTradeButtonsMap'
+import { limitOrdersTradeButtonsMap } from './limitOrdersTradeButtonsMap'
 
 import { useLimitOrdersFormState } from '../../hooks/useLimitOrdersFormState'
 
-const CompatibilityIssuesWarningWrapper = styled.div`
-  margin-top: -10px;
-`
-
 export interface TradeButtonsProps {
   tradeContext: TradeFlowContext | null
   priceImpact: PriceImpact
@@ -36,67 +32,56 @@ export interface TradeButtonsProps {
 
 export function TradeButtons(props: TradeButtonsProps) {
   const { tradeContext, priceImpact } = props
-  const inputCurrencyAmount = tradeContext?.postOrderParams.inputAmount
 
   const settingsState = useAtomValue(limitOrdersSettingsAtom)
-  const formState = useLimitOrdersFormState()
+  const localFormValidation = useLimitOrdersFormState()
+  const primaryFormValidation = useGetTradeFormValidation()
   const tradeState = useLimitOrdersDerivedState()
   const toggleWalletModal = useToggleWalletModal()
   const quote = useTradeQuote()
   const warningsAccepted = useLimitOrdersWarningsAccepted(false)
-  const wrapUnwrapCallback = useWrapCallback(inputCurrencyAmount)
-  const transactionConfirmState = useAtomValue(transactionConfirmAtom)
-  const closeModals = useCloseModals()
-  const showTransactionConfirmationModal = useModalIsOpen(ApplicationModal.TRANSACTION_CONFIRMATION)
   const { isSupportedWallet } = useWalletDetails()
-  const { inputCurrency, outputCurrency } = tradeState
-  const isSwapUnsupported = isUnsupportedTokenInQuote(quote)
   const tradeConfirmActions = useTradeConfirmActions()
 
-  const wrapUnwrapParams: WrapUnwrapParams = {
-    isNativeIn: !!inputCurrencyAmount?.currency.isNative,
-    wrapUnwrapCallback,
-    transactionConfirmState,
-    closeModals,
-    showTransactionConfirmationModal,
-  }
-
   const handleTrade = useHandleOrderPlacement(tradeContext, priceImpact, settingsState, tradeConfirmActions)
 
-  const doTrade = useCallback(() => {
-    if (settingsState.expertMode) {
-      handleTrade()
-    } else {
-      tradeConfirmActions.onOpen()
-    }
-  }, [settingsState.expertMode, handleTrade, tradeConfirmActions])
+  const isExpertMode = settingsState.expertMode
 
-  const buttonFactory = limitOrdersTradeButtonsMap[formState]
+  const tradeFormButtonContext: TradeFormButtonContext = {
+    defaultText: 'Limit order',
+    derivedState: tradeState,
+    doTrade: handleTrade,
+    quote,
+    isSupportedWallet,
+    confirmTrade() {
+      tradeConfirmActions.onOpen()
+    },
+    connectWallet() {
+      toggleWalletModal()
+    },
+  }
 
-  const isButtonDisabled = (typeof buttonFactory !== 'function' && buttonFactory.disabled) || !warningsAccepted
-  const showWarnings = !!(inputCurrency && outputCurrency && isSwapUnsupported)
+  // Display local form validation errors only when there are no primary errors
+  if (!primaryFormValidation && localFormValidation) {
+    const buttonFactory = limitOrdersTradeButtonsMap[localFormValidation]
 
-  const Button =
-    typeof buttonFactory === 'function' ? (
-      buttonFactory({ tradeState, toggleWalletModal, quote, wrapUnwrapParams, doTrade })
+    return typeof buttonFactory === 'function' ? (
+      buttonFactory()
     ) : (
-      <SwapButton id={buttonFactory.id} onClick={doTrade} disabled={isButtonDisabled}>
+      <TradeFormBlankButton id={buttonFactory.id} disabled={true}>
         <Trans>{buttonFactory.text}</Trans>
-      </SwapButton>
+      </TradeFormBlankButton>
     )
+  }
 
   return (
-    <>
-      {Button}
-      {showWarnings && (
-        <CompatibilityIssuesWarningWrapper>
-          <CompatibilityIssuesWarning
-            currencyIn={inputCurrency}
-            currencyOut={outputCurrency}
-            isSupportedWallet={isSupportedWallet}
-          />
-        </CompatibilityIssuesWarningWrapper>
-      )}
-    </>
+    <TradeFormButtons
+      doTradeText="Place limit order"
+      confirmText="Review limit order"
+      validation={primaryFormValidation}
+      context={tradeFormButtonContext}
+      isExpertMode={isExpertMode}
+      isDisabled={!warningsAccepted}
+    />
   )
 }
diff --git a/src/modules/limitOrders/containers/TradeButtons/limitOrdersTradeButtonsMap.tsx b/src/modules/limitOrders/containers/TradeButtons/limitOrdersTradeButtonsMap.tsx
index 7d7d211bea..5cae823352 100644
--- a/src/modules/limitOrders/containers/TradeButtons/limitOrdersTradeButtonsMap.tsx
+++ b/src/modules/limitOrders/containers/TradeButtons/limitOrdersTradeButtonsMap.tsx
@@ -1,219 +1,29 @@
 import React from 'react'
 
-import { Trans } from '@lingui/macro'
-
-import { ButtonPrimary } from 'legacy/components/Button'
-import { TransactionConfirmationModal } from 'legacy/components/TransactionConfirmationModal'
-import { WrapUnwrapCallback } from 'legacy/hooks/useWrapCallback'
-import { ButtonSize } from 'legacy/theme/enum'
-
-import { LimitOrdersDerivedState } from 'modules/limitOrders'
-import { TransactionConfirmState } from 'modules/swap/state/transactionConfirmAtom'
-import { TradeLoadingButton } from 'modules/trade/pure/TradeLoadingButton'
-import { TradeQuoteState } from 'modules/tradeQuote'
-
-import { GpQuoteErrorCodes } from 'api/gnosisProtocol/errors/QuoteError'
-import { TradeApproveButton } from 'common/containers/TradeApprove/TradeApproveButton'
-import { TokenSymbol } from 'common/pure/TokenSymbol'
+import { TradeLoadingButton } from 'common/pure/TradeLoadingButton'
 
 import { LimitOrdersFormState } from '../../hooks/useLimitOrdersFormState'
 
-export interface WrapUnwrapParams {
-  isNativeIn: boolean
-  wrapUnwrapCallback: WrapUnwrapCallback | null
-  transactionConfirmState: TransactionConfirmState
-  closeModals(): void
-  showTransactionConfirmationModal: boolean
-}
-
-export interface TradeButtonsParams {
-  tradeState: LimitOrdersDerivedState
-  quote: TradeQuoteState
-  toggleWalletModal: () => void
-  wrapUnwrapParams: WrapUnwrapParams
-  doTrade: () => void
-}
-
 interface ButtonConfig {
-  disabled: boolean
-  text: string
+  text: JSX.Element | string
   id?: string
 }
 
 interface ButtonCallback {
-  (params: TradeButtonsParams): JSX.Element | null
-}
-
-export function SwapButton({
-  children,
-  disabled,
-  onClick,
-  id,
-}: {
-  children: React.ReactNode
-  disabled: boolean
-  onClick?: () => void
-  id?: string
-}) {
-  return (
-    <ButtonPrimary
-      id={id}
-      fontSize={'16px !important'}
-      onClick={onClick}
-      disabled={disabled}
-      buttonSize={ButtonSize.BIG}
-    >
-      <Trans>{children}</Trans>
-    </ButtonPrimary>
-  )
-}
-
-const quoteErrorTexts: { [key in GpQuoteErrorCodes]: string } = {
-  [GpQuoteErrorCodes.UNHANDLED_ERROR]: 'Error loading price. Try again later.',
-  [GpQuoteErrorCodes.TransferEthToContract]:
-    'Buying native currency with smart contract wallets is not currently supported',
-  [GpQuoteErrorCodes.UnsupportedToken]: 'Unsupported token',
-  [GpQuoteErrorCodes.InsufficientLiquidity]: 'Insufficient liquidity for this trade.',
-  [GpQuoteErrorCodes.FeeExceedsFrom]: 'Sell amount is too small',
-  [GpQuoteErrorCodes.ZeroPrice]: 'Invalid price. Try increasing input/output amount.',
+  (): JSX.Element | null
 }
 
 export const limitOrdersTradeButtonsMap: { [key in LimitOrdersFormState]: ButtonConfig | ButtonCallback } = {
-  [LimitOrdersFormState.Loading]: () => (
-    <SwapButton disabled={true}>
-      <TradeLoadingButton />
-    </SwapButton>
-  ),
-  [LimitOrdersFormState.CanTrade]: {
-    disabled: false,
-    text: 'Review limit order',
-    id: 'review-limit-order-btn',
-  },
-  [LimitOrdersFormState.ApproveAndSwap]: ({ tradeState: { inputCurrency }, doTrade }: TradeButtonsParams) => {
-    const token = inputCurrency?.wrapped
-    const symbol = <TokenSymbol token={token} length={6} />
-
-    return (
-      <SwapButton disabled={false} onClick={doTrade} id="review-limit-order-btn">
-        <Trans>Review (Approve&nbsp;{symbol}&nbsp;& Limit order)</Trans>
-      </SwapButton>
-    )
-  },
-  [LimitOrdersFormState.ExpertApproveAndSwap]: ({ tradeState: { inputCurrency }, doTrade }: TradeButtonsParams) => {
-    const token = inputCurrency?.wrapped
-    const symbol = <TokenSymbol token={token} length={6} />
-
-    return (
-      <SwapButton disabled={false} onClick={doTrade} id="approve-and-place-limit-order-btn">
-        <Trans>Confirm (Approve&nbsp;{symbol}&nbsp;& Limit order)</Trans>
-      </SwapButton>
-    )
-  },
-  [LimitOrdersFormState.ExpertCanTrade]: {
-    disabled: false,
-    text: 'Place limit order',
-    id: 'place-limit-order-btn',
-  },
-  [LimitOrdersFormState.SwapIsUnsupported]: {
-    disabled: true,
-    text: 'Unsupported token',
-  },
-  [LimitOrdersFormState.WalletIsUnsupported]: {
-    disabled: true,
-    text: 'Wallet Unsupported',
-  },
-  [LimitOrdersFormState.ReadonlyGnosisSafeUser]: {
-    disabled: true,
-    text: 'Read Only',
-  },
-  [LimitOrdersFormState.NeedToSelectToken]: {
-    disabled: true,
-    text: 'Select a token',
-  },
-  [LimitOrdersFormState.AmountIsNotSet]: {
-    disabled: true,
-    text: 'Enter an amount',
+  [LimitOrdersFormState.RateLoading]: {
+    text: <TradeLoadingButton />,
   },
   [LimitOrdersFormState.PriceIsNotSet]: {
-    disabled: true,
     text: 'Enter a price',
   },
-  [LimitOrdersFormState.InvalidRecipient]: {
-    disabled: true,
-    text: 'Enter a valid recipient',
-  },
-  [LimitOrdersFormState.CantLoadBalances]: {
-    disabled: true,
-    text: "Couldn't load balances",
-  },
   [LimitOrdersFormState.ZeroPrice]: {
-    disabled: true,
     text: 'Invalid price. Try increasing input/output amount.',
   },
   [LimitOrdersFormState.FeeExceedsFrom]: {
-    disabled: true,
     text: 'Sell amount is too small',
   },
-  [LimitOrdersFormState.QuoteError]: ({ quote }: TradeButtonsParams) => {
-    const defaultError = quoteErrorTexts[GpQuoteErrorCodes.UNHANDLED_ERROR]
-
-    return (
-      <SwapButton disabled={true}>
-        <Trans>{(quote.error && quoteErrorTexts[quote.error.type]) || defaultError}</Trans>
-      </SwapButton>
-    )
-  },
-  [LimitOrdersFormState.InsufficientBalance]: ({ tradeState }: TradeButtonsParams) => {
-    return (
-      <SwapButton disabled={true}>
-        <Trans>Insufficient&nbsp;{<TokenSymbol token={tradeState.inputCurrency} />}&nbsp;balance</Trans>
-      </SwapButton>
-    )
-  },
-  [LimitOrdersFormState.WalletIsNotConnected]: ({ toggleWalletModal }: TradeButtonsParams) => {
-    return (
-      <SwapButton disabled={false} onClick={toggleWalletModal}>
-        <Trans>Connect Wallet</Trans>
-      </SwapButton>
-    )
-  },
-  [LimitOrdersFormState.NotApproved]: ({ tradeState }: TradeButtonsParams) => {
-    const amountToApprove = tradeState.inputCurrencyAmount
-
-    return (
-      <>
-        {!!amountToApprove && (
-          <TradeApproveButton amountToApprove={amountToApprove}>
-            <SwapButton disabled={true}>
-              <Trans>Review limit order</Trans>
-            </SwapButton>
-          </TradeApproveButton>
-        )}
-      </>
-    )
-  },
-  [LimitOrdersFormState.WrapUnwrap]: ({ wrapUnwrapParams }: TradeButtonsParams) => {
-    const {
-      isNativeIn,
-      wrapUnwrapCallback,
-      transactionConfirmState: { pendingText, operationType },
-      closeModals,
-      showTransactionConfirmationModal,
-    } = wrapUnwrapParams
-
-    return (
-      <>
-        <SwapButton disabled={false} onClick={() => wrapUnwrapCallback?.({ useModals: true })}>
-          <Trans>{isNativeIn ? 'Wrap' : 'Unwrap'}</Trans>
-        </SwapButton>
-        <TransactionConfirmationModal
-          attemptingTxn={true}
-          isOpen={showTransactionConfirmationModal}
-          pendingText={pendingText}
-          onDismiss={closeModals}
-          operationType={operationType}
-        />
-      </>
-    )
-  },
 }
diff --git a/src/modules/limitOrders/hooks/useLimitOrdersFormState.ts b/src/modules/limitOrders/hooks/useLimitOrdersFormState.ts
index 3dc29ce5ba..fd814225ef 100644
--- a/src/modules/limitOrders/hooks/useLimitOrdersFormState.ts
+++ b/src/modules/limitOrders/hooks/useLimitOrdersFormState.ts
@@ -1,166 +1,39 @@
 import { useAtomValue } from 'jotai/utils'
 
-import { Currency, CurrencyAmount, Fraction, Token } from '@uniswap/sdk-core'
+import { Currency, CurrencyAmount, Fraction } from '@uniswap/sdk-core'
 
-import { GP_VAULT_RELAYER } from 'legacy/constants'
-import { ApprovalState } from 'legacy/hooks/useApproveCallback'
-import useENSAddress from 'legacy/hooks/useENSAddress'
-import { useTokenAllowance } from 'legacy/hooks/useTokenAllowance'
-import { isAddress } from 'legacy/utils'
-
-import { LimitOrdersDerivedState } from 'modules/limitOrders'
-import { limitOrdersSettingsAtom, LimitOrdersSettingsState } from 'modules/limitOrders/state/limitOrdersSettingsAtom'
 import { limitRateAtom } from 'modules/limitOrders/state/limitRateAtom'
-import { isUnsupportedTokenInQuote } from 'modules/limitOrders/utils/isUnsupportedTokenInQuote'
-import { useIsWrapOrUnwrap } from 'modules/trade/hooks/useIsWrapOrUnwrap'
-import { TradeQuoteState, useTradeQuote } from 'modules/tradeQuote'
-import { useGnosisSafeInfo, useWalletDetails, useWalletInfo } from 'modules/wallet'
+import { useTradeQuote } from 'modules/tradeQuote'
 
-import { useTradeApproveState } from 'common/containers/TradeApprove/useTradeApproveState'
-import { useIsTxBundlingEnabled } from 'common/hooks/useIsTxBundlingEnabled'
 import { useSafeMemo } from 'common/hooks/useSafeMemo'
+import { isFractionFalsy } from 'utils/isFractionFalsy'
 
 import { useLimitOrdersDerivedState } from './useLimitOrdersDerivedState'
 
 export enum LimitOrdersFormState {
-  NotApproved = 'NotApproved',
-  CanTrade = 'CanTrade',
-  ExpertCanTrade = 'ExpertCanTrade',
-  Loading = 'Loading',
-  SwapIsUnsupported = 'SwapIsUnsupported',
-  WrapUnwrap = 'WrapUnwrap',
-  InvalidRecipient = 'InvalidRecipient',
-  WalletIsUnsupported = 'WalletIsUnsupported',
-  WalletIsNotConnected = 'WalletIsNotConnected',
-  ReadonlyGnosisSafeUser = 'ReadonlyGnosisSafeUser',
-  NeedToSelectToken = 'NeedToSelectToken',
-  AmountIsNotSet = 'AmountIsNotSet',
+  RateLoading = 'RateLoading',
+  FeeExceedsFrom = 'FeeExceedsFrom',
   PriceIsNotSet = 'PriceIsNotSet',
-  InsufficientBalance = 'InsufficientBalance',
-  CantLoadBalances = 'CantLoadBalances',
-  QuoteError = 'QuoteError',
   ZeroPrice = 'ZeroPrice',
-  FeeExceedsFrom = 'FeeExceedsFrom',
-  ApproveAndSwap = 'ApproveAndSwap',
-  ExpertApproveAndSwap = 'ExpertApproveAndSwap',
 }
 
 interface LimitOrdersFormParams {
-  account: string | undefined
-  isSwapUnsupported: boolean
-  isSupportedWallet: boolean
-  isReadonlyGnosisSafeUser: boolean
-  isTxBundlingEnabled: boolean
-  currentAllowance: CurrencyAmount<Token> | undefined
-  approvalState: ApprovalState
-  tradeState: LimitOrdersDerivedState
-  settingsState: LimitOrdersSettingsState
-  recipientEnsAddress: string | null
-  quote: TradeQuoteState | null
   activeRate: Fraction | null
-  isWrapOrUnwrap: boolean
   isRateLoading: boolean
-  buyAmount: CurrencyAmount<Currency> | null
+  feeAmount: CurrencyAmount<Currency> | null
   sellAmount: CurrencyAmount<Currency> | null
+  buyAmount: CurrencyAmount<Currency> | null
 }
 
-function getLimitOrdersFormState(params: LimitOrdersFormParams): LimitOrdersFormState {
-  const {
-    account,
-    isReadonlyGnosisSafeUser,
-    isTxBundlingEnabled,
-    isSupportedWallet,
-    currentAllowance,
-    approvalState,
-    tradeState,
-    settingsState,
-    recipientEnsAddress,
-    quote,
-    isWrapOrUnwrap,
-    activeRate,
-    isRateLoading,
-    sellAmount,
-    buyAmount,
-    isSwapUnsupported,
-  } = params
-
-  const { inputCurrency, outputCurrency, inputCurrencyAmount, outputCurrencyAmount, inputCurrencyBalance, recipient } =
-    tradeState
-
-  const inputAmountIsNotSet = !inputCurrencyAmount || inputCurrencyAmount.equalTo(0)
-  const outputAmountIsNotSet = !outputCurrencyAmount || outputCurrencyAmount.equalTo(0)
-  const feeAmount =
-    quote?.response?.quote?.feeAmount && sellAmount
-      ? CurrencyAmount.fromRawAmount(sellAmount.currency, quote?.response?.quote?.feeAmount)
-      : null
-  const approvalRequired = approvalState === ApprovalState.NOT_APPROVED || approvalState === ApprovalState.PENDING
+function getLimitOrdersFormState(params: LimitOrdersFormParams): LimitOrdersFormState | null {
+  const { activeRate, isRateLoading, feeAmount, sellAmount, buyAmount } = params
 
-  if (!inputCurrency || !outputCurrency) {
-    return LimitOrdersFormState.NeedToSelectToken
+  if (isFractionFalsy(activeRate)) {
+    return LimitOrdersFormState.PriceIsNotSet
   }
 
-  if (recipient && !recipientEnsAddress && !isAddress(recipient)) {
-    return LimitOrdersFormState.InvalidRecipient
-  }
-
-  if (!isWrapOrUnwrap && quote?.error) {
-    return LimitOrdersFormState.QuoteError
-  }
-
-  if (isSwapUnsupported) {
-    return LimitOrdersFormState.SwapIsUnsupported
-  }
-
-  if (!account) {
-    return LimitOrdersFormState.WalletIsNotConnected
-  }
-
-  if (isWrapOrUnwrap) {
-    if (inputAmountIsNotSet && outputAmountIsNotSet) {
-      return LimitOrdersFormState.AmountIsNotSet
-    }
-  } else {
-    if (inputAmountIsNotSet || outputAmountIsNotSet) {
-      if (!activeRate || activeRate.equalTo(0)) {
-        return LimitOrdersFormState.PriceIsNotSet
-      }
-
-      return LimitOrdersFormState.AmountIsNotSet
-    }
-  }
-
-  if (!isSupportedWallet) {
-    return LimitOrdersFormState.WalletIsUnsupported
-  }
-
-  if (isReadonlyGnosisSafeUser) {
-    return LimitOrdersFormState.ReadonlyGnosisSafeUser
-  }
-
-  if (!inputCurrencyBalance) {
-    return LimitOrdersFormState.CantLoadBalances
-  }
-
-  if (inputCurrencyAmount && inputCurrencyBalance.lessThan(inputCurrencyAmount)) {
-    return LimitOrdersFormState.InsufficientBalance
-  }
-
-  if (!isWrapOrUnwrap && (isRateLoading || !currentAllowance || !quote)) {
-    return LimitOrdersFormState.Loading
-  }
-
-  if (isWrapOrUnwrap) {
-    return LimitOrdersFormState.WrapUnwrap
-  }
-
-  if (approvalRequired) {
-    if (isTxBundlingEnabled) {
-      if (settingsState.expertMode) {
-        return LimitOrdersFormState.ExpertApproveAndSwap
-      }
-      return LimitOrdersFormState.ApproveAndSwap
-    }
-    return LimitOrdersFormState.NotApproved
+  if (isRateLoading) {
+    return LimitOrdersFormState.RateLoading
   }
 
   if (
@@ -174,53 +47,26 @@ function getLimitOrdersFormState(params: LimitOrdersFormParams): LimitOrdersForm
     return LimitOrdersFormState.FeeExceedsFrom
   }
 
-  if (settingsState.expertMode) {
-    return LimitOrdersFormState.ExpertCanTrade
-  }
-
-  return LimitOrdersFormState.CanTrade
+  return null
 }
 
-export function useLimitOrdersFormState(): LimitOrdersFormState {
-  const { chainId, account } = useWalletInfo()
-  const tradeState = useLimitOrdersDerivedState()
-  const settingsState = useAtomValue(limitOrdersSettingsAtom)
-  const { isSupportedWallet } = useWalletDetails()
-  const gnosisSafeInfo = useGnosisSafeInfo()
-  const isReadonlyGnosisSafeUser = gnosisSafeInfo?.isReadOnly || false
-  const isTxBundlingEnabled = useIsTxBundlingEnabled()
+export function useLimitOrdersFormState(): LimitOrdersFormState | null {
+  const { inputCurrencyAmount, outputCurrencyAmount } = useLimitOrdersDerivedState()
   const quote = useTradeQuote()
   const { activeRate, isLoading } = useAtomValue(limitRateAtom)
-  const isWrapOrUnwrap = useIsWrapOrUnwrap()
-
-  const { inputCurrency, recipient } = tradeState
-  const sellAmount = tradeState.inputCurrencyAmount
-  const buyAmount = tradeState.outputCurrencyAmount
-  const sellToken = inputCurrency?.isToken ? inputCurrency : undefined
-  const spender = chainId ? GP_VAULT_RELAYER[chainId] : undefined
 
-  const currentAllowance = useTokenAllowance(sellToken, account ?? undefined, spender)
-  const approvalState = useTradeApproveState(sellAmount)
-  const isSwapUnsupported = isUnsupportedTokenInQuote(quote)
-  const { address: recipientEnsAddress } = useENSAddress(recipient)
+  const feeRawAmount = quote?.response?.quote?.feeAmount
+  const feeAmount =
+    feeRawAmount && inputCurrencyAmount
+      ? CurrencyAmount.fromRawAmount(inputCurrencyAmount.currency, feeRawAmount)
+      : null
 
   const params: LimitOrdersFormParams = {
-    account,
-    isReadonlyGnosisSafeUser,
-    isTxBundlingEnabled,
-    isSwapUnsupported,
-    isSupportedWallet,
-    approvalState,
-    currentAllowance,
-    tradeState,
-    settingsState,
-    recipientEnsAddress,
-    quote,
     activeRate,
-    isWrapOrUnwrap,
+    feeAmount,
     isRateLoading: isLoading,
-    buyAmount,
-    sellAmount,
+    sellAmount: inputCurrencyAmount,
+    buyAmount: outputCurrencyAmount,
   }
 
   return useSafeMemo(() => {
diff --git a/src/modules/limitOrders/index.ts b/src/modules/limitOrders/index.ts
index 70bb9f075e..6c9cf0c532 100644
--- a/src/modules/limitOrders/index.ts
+++ b/src/modules/limitOrders/index.ts
@@ -4,3 +4,4 @@ export * from './updaters/QuoteObserverUpdater'
 export * from './updaters/InitialPriceUpdater'
 export * from './updaters/ExecutionPriceUpdater'
 export * from './state/limitOrdersRawStateAtom'
+export * from './state/limitOrdersSettingsAtom'
diff --git a/src/modules/swap/pure/SwapButtons/styled.tsx b/src/modules/swap/pure/SwapButtons/styled.tsx
index f52bcd371e..b650ca0ec7 100644
--- a/src/modules/swap/pure/SwapButtons/styled.tsx
+++ b/src/modules/swap/pure/SwapButtons/styled.tsx
@@ -4,7 +4,7 @@ import { ButtonError } from 'legacy/components/Button'
 import { RowBetween } from 'legacy/components/Row'
 import { ButtonSize } from 'legacy/theme/enum'
 
-import { TradeLoadingButton } from 'modules/trade/pure/TradeLoadingButton'
+import { TradeLoadingButton } from 'common/pure/TradeLoadingButton'
 
 export interface SwapButtonBoxProps {
   showLoading?: boolean
diff --git a/src/modules/trade/index.ts b/src/modules/trade/index.ts
index 8099952643..881ffef03d 100644
--- a/src/modules/trade/index.ts
+++ b/src/modules/trade/index.ts
@@ -4,3 +4,4 @@ export * from './pure/TradeConfirmation'
 export * from './hooks/useTradeConfirmActions'
 export * from './hooks/useTradeTypeInfo'
 export * from './hooks/setupTradeState/useSetupTradeState'
+export * from './types/TradeDerivedState'
diff --git a/src/modules/tradeFormValidation/hooks/useGetTradeFormValidation.ts b/src/modules/tradeFormValidation/hooks/useGetTradeFormValidation.ts
new file mode 100644
index 0000000000..04c2cb7275
--- /dev/null
+++ b/src/modules/tradeFormValidation/hooks/useGetTradeFormValidation.ts
@@ -0,0 +1,15 @@
+import { useAtomValue } from 'jotai'
+
+import useDebounce from 'legacy/hooks/useDebounce'
+
+import { tradeFormValidationAtom } from '../state/tradeFormValidationAtom'
+import { TradeFormValidation } from '../types'
+
+const TRADE_FORM_VALIDATION_DEBOUNCE = 200
+
+export function useGetTradeFormValidation(): TradeFormValidation | null {
+  const validation = useAtomValue(tradeFormValidationAtom)
+
+  // Just in case, to avoid blinking of the trade form button
+  return useDebounce(validation, TRADE_FORM_VALIDATION_DEBOUNCE)
+}
diff --git a/src/modules/tradeFormValidation/hooks/useTradeFormValidationContext.ts b/src/modules/tradeFormValidation/hooks/useTradeFormValidationContext.ts
new file mode 100644
index 0000000000..f4ad4ad11f
--- /dev/null
+++ b/src/modules/tradeFormValidation/hooks/useTradeFormValidationContext.ts
@@ -0,0 +1,56 @@
+import { useMemo } from 'react'
+
+import useENSAddress from 'legacy/hooks/useENSAddress'
+import { useIsTradeUnsupported } from 'legacy/state/lists/hooks'
+
+import { isUnsupportedTokenInQuote } from 'modules/limitOrders/utils/isUnsupportedTokenInQuote'
+import { useDerivedTradeState } from 'modules/trade/hooks/useDerivedTradeState'
+import { useIsWrapOrUnwrap } from 'modules/trade/hooks/useIsWrapOrUnwrap'
+import { useTradeQuote } from 'modules/tradeQuote'
+import { useGnosisSafeInfo, useWalletDetails, useWalletInfo } from 'modules/wallet'
+
+import { useTradeApproveState } from 'common/containers/TradeApprove'
+import { useIsTxBundlingEnabled } from 'common/hooks/useIsTxBundlingEnabled'
+
+import { TradeFormValidationCommonContext } from '../types'
+
+export function useTradeFormValidationContext(): TradeFormValidationCommonContext | null {
+  const { account } = useWalletInfo()
+  const { state: derivedTradeState } = useDerivedTradeState()
+  const tradeQuote = useTradeQuote()
+
+  const { inputCurrency, outputCurrency, slippageAdjustedSellAmount, recipient } = derivedTradeState || {}
+  const approvalState = useTradeApproveState(slippageAdjustedSellAmount)
+  const { address: recipientEnsAddress } = useENSAddress(recipient)
+  const isSwapUnsupported =
+    useIsTradeUnsupported(inputCurrency, outputCurrency) || isUnsupportedTokenInQuote(tradeQuote)
+
+  const isTxBundlingEnabled = useIsTxBundlingEnabled()
+  const isWrapUnwrap = useIsWrapOrUnwrap()
+  const { isSupportedWallet } = useWalletDetails()
+  const gnosisSafeInfo = useGnosisSafeInfo()
+
+  const isSafeReadonlyUser = gnosisSafeInfo?.isReadOnly || false
+
+  const commonContext = {
+    account,
+    isWrapUnwrap,
+    isTxBundlingEnabled,
+    isSupportedWallet,
+    isSwapUnsupported,
+    isSafeReadonlyUser,
+    recipientEnsAddress,
+    approvalState,
+    tradeQuote,
+  }
+
+  return useMemo(() => {
+    if (!derivedTradeState) return null
+
+    return {
+      ...commonContext,
+      derivedTradeState,
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [...Object.values(commonContext), derivedTradeState])
+}
diff --git a/src/modules/tradeFormValidation/index.ts b/src/modules/tradeFormValidation/index.ts
new file mode 100644
index 0000000000..ecf9e5dbf6
--- /dev/null
+++ b/src/modules/tradeFormValidation/index.ts
@@ -0,0 +1,5 @@
+export * from './updaters/TradeFormValidationUpdater'
+export * from './hooks/useGetTradeFormValidation'
+export * from './pure/TradeFormButtons'
+export * from './pure/TradeFormBlankButton'
+export * from './types'
diff --git a/src/modules/tradeFormValidation/pure/TradeFormBlankButton/index.tsx b/src/modules/tradeFormValidation/pure/TradeFormBlankButton/index.tsx
new file mode 100644
index 0000000000..efda5ba520
--- /dev/null
+++ b/src/modules/tradeFormValidation/pure/TradeFormBlankButton/index.tsx
@@ -0,0 +1,65 @@
+import React, { useEffect, useRef, useState } from 'react'
+
+import { Trans } from '@lingui/macro'
+import { lighten, transparentize } from 'polished'
+import styled from 'styled-components/macro'
+
+const LONG_TEXT_LENGTH = 20
+
+const ActionButton = styled.button<{ hasLongText$: boolean }>`
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background: ${({ theme }) => theme.bg2};
+  color: ${({ theme }) => theme.white};
+  font-size: ${({ hasLongText$ }) => (hasLongText$ ? '16px' : '18px')};
+  font-weight: 600;
+  border-radius: 16px;
+  cursor: pointer;
+  min-height: 58px;
+  text-align: center;
+  transition: background 0.2s ease-in-out, color 0.2s ease-in-out;
+  border: none;
+  outline: none;
+
+  &:hover {
+    background: ${({ theme }) => lighten(0.08, theme.bg2)};
+  }
+
+  &:disabled {
+    background-color: ${({ theme }) => theme.grey1};
+    color: ${({ theme }) => transparentize(0.4, theme.text1)};
+    background-image: none;
+    border: 0;
+    cursor: auto;
+    animation: none;
+    transform: none;
+  }
+`
+
+export interface TradeFormPrimaryButtonProps {
+  children: JSX.Element | string
+  disabled?: boolean
+  id?: string
+
+  onClick?(): void
+}
+
+export function TradeFormBlankButton({ onClick, children, disabled, id }: TradeFormPrimaryButtonProps) {
+  const ref = useRef<HTMLButtonElement>(null)
+  const [hasLongText, setHasLongText] = useState(false)
+
+  useEffect(() => {
+    if (!ref?.current) return
+
+    const text = ref.current.innerText
+
+    setHasLongText(text.length > LONG_TEXT_LENGTH)
+  }, [children])
+
+  return (
+    <ActionButton ref={ref} id={id} onClick={onClick} disabled={disabled} hasLongText$={hasLongText}>
+      <Trans>{children}</Trans>
+    </ActionButton>
+  )
+}
diff --git a/src/modules/tradeFormValidation/pure/TradeFormButtons/index.tsx b/src/modules/tradeFormValidation/pure/TradeFormButtons/index.tsx
new file mode 100644
index 0000000000..eb63f6e25a
--- /dev/null
+++ b/src/modules/tradeFormValidation/pure/TradeFormButtons/index.tsx
@@ -0,0 +1,46 @@
+import React from 'react'
+
+import { Trans } from '@lingui/macro'
+
+import { tradeButtonsMap } from './tradeButtonsMap'
+
+import { TradeFormButtonContext, TradeFormValidation } from '../../types'
+import { TradeFormBlankButton } from '../TradeFormBlankButton'
+
+export interface TradeFormButtonsProps {
+  validation: TradeFormValidation | null
+  context: TradeFormButtonContext
+  doTradeText: string
+  confirmText: string
+  isExpertMode: boolean
+  isDisabled?: boolean
+}
+
+export function TradeFormButtons(props: TradeFormButtonsProps) {
+  const { validation, context, isExpertMode, isDisabled, doTradeText, confirmText } = props
+
+  // When there are no validation errors
+  if (!validation) {
+    return (
+      <TradeFormBlankButton
+        id="do-trade-button"
+        disabled={isDisabled}
+        onClick={() => (isExpertMode ? context.doTrade() : context.confirmTrade())}
+      >
+        {isExpertMode ? doTradeText : confirmText}
+      </TradeFormBlankButton>
+    )
+  }
+
+  const buttonFactory = tradeButtonsMap[validation]
+
+  if (typeof buttonFactory === 'function') {
+    return buttonFactory(context)
+  }
+
+  return (
+    <TradeFormBlankButton id={buttonFactory.id} disabled={true}>
+      <Trans>{buttonFactory.text}</Trans>
+    </TradeFormBlankButton>
+  )
+}
diff --git a/src/modules/tradeFormValidation/pure/TradeFormButtons/tradeButtonsMap.tsx b/src/modules/tradeFormValidation/pure/TradeFormButtons/tradeButtonsMap.tsx
new file mode 100644
index 0000000000..7d2184f314
--- /dev/null
+++ b/src/modules/tradeFormValidation/pure/TradeFormButtons/tradeButtonsMap.tsx
@@ -0,0 +1,146 @@
+import React from 'react'
+
+import { Trans } from '@lingui/macro'
+import styled from 'styled-components/macro'
+
+import { CompatibilityIssuesWarning } from 'modules/trade/pure/CompatibilityIssuesWarning'
+
+import { GpQuoteErrorCodes } from 'api/gnosisProtocol/errors/QuoteError'
+import { TradeApproveButton } from 'common/containers/TradeApprove'
+import { TokenSymbol } from 'common/pure/TokenSymbol'
+import { TradeLoadingButton } from 'common/pure/TradeLoadingButton'
+
+import { TradeFormButtonContext, TradeFormValidation } from '../../types'
+import { TradeFormBlankButton } from '../TradeFormBlankButton'
+
+interface ButtonErrorConfig {
+  text: JSX.Element | string
+  id?: string
+}
+
+interface ButtonCallback {
+  (context: TradeFormButtonContext): JSX.Element | null
+}
+
+const CompatibilityIssuesWarningWrapper = styled.div`
+  margin-top: -10px;
+`
+
+const quoteErrorTexts: Record<GpQuoteErrorCodes, string> = {
+  [GpQuoteErrorCodes.UNHANDLED_ERROR]: 'Error loading price. Try again later.',
+  [GpQuoteErrorCodes.TransferEthToContract]:
+    'Buying native currency with smart contract wallets is not currently supported',
+  [GpQuoteErrorCodes.UnsupportedToken]: 'Unsupported token',
+  [GpQuoteErrorCodes.InsufficientLiquidity]: 'Insufficient liquidity for this trade.',
+  [GpQuoteErrorCodes.FeeExceedsFrom]: 'Sell amount is too small',
+  [GpQuoteErrorCodes.ZeroPrice]: 'Invalid price. Try increasing input/output amount.',
+}
+
+export const tradeButtonsMap: Record<TradeFormValidation, ButtonErrorConfig | ButtonCallback> = {
+  [TradeFormValidation.WrapUnwrapAmountNotSet]: {
+    text: 'Enter an amount',
+  },
+  // TODO: implement
+  [TradeFormValidation.WrapUnwrapFlow]: {
+    text: 'Wrap or unwrap',
+  },
+  [TradeFormValidation.CurrencyNotSet]: {
+    text: 'Select a token',
+  },
+  [TradeFormValidation.InputAmountNotSet]: {
+    text: 'Enter an amount',
+  },
+  [TradeFormValidation.RecipientInvalid]: {
+    text: 'Enter a valid recipient',
+  },
+  [TradeFormValidation.CurrencyNotSupported]: (context) => {
+    const { derivedState, isSupportedWallet } = context
+    const { inputCurrency, outputCurrency } = derivedState
+
+    return inputCurrency && outputCurrency ? (
+      <>
+        <TradeFormBlankButton disabled={true}>
+          <Trans>Unsupported token</Trans>
+        </TradeFormBlankButton>
+        <CompatibilityIssuesWarningWrapper>
+          <CompatibilityIssuesWarning
+            currencyIn={inputCurrency}
+            currencyOut={outputCurrency}
+            isSupportedWallet={isSupportedWallet}
+          />
+        </CompatibilityIssuesWarningWrapper>
+      </>
+    ) : null
+  },
+  [TradeFormValidation.QuoteErrors]: (context) => {
+    const { quote } = context
+    const defaultError = quoteErrorTexts[GpQuoteErrorCodes.UNHANDLED_ERROR]
+
+    return (
+      <TradeFormBlankButton disabled={true}>
+        <Trans>{(quote.error && quoteErrorTexts[quote.error.type]) || defaultError}</Trans>
+      </TradeFormBlankButton>
+    )
+  },
+  [TradeFormValidation.WalletNotConnected]: (context) => {
+    return (
+      <TradeFormBlankButton onClick={context.connectWallet}>
+        <Trans>Connect Wallet</Trans>
+      </TradeFormBlankButton>
+    )
+  },
+  [TradeFormValidation.WalletNotSupported]: {
+    text: 'Wallet Unsupported',
+  },
+  [TradeFormValidation.SafeReadonlyUser]: {
+    text: 'Read Only',
+  },
+  [TradeFormValidation.QuoteLoading]: {
+    text: <TradeLoadingButton />,
+  },
+  [TradeFormValidation.BalancesNotLoaded]: {
+    text: "Couldn't load balances",
+  },
+  [TradeFormValidation.BalanceInsufficient]: (context) => {
+    return (
+      <TradeFormBlankButton disabled={true}>
+        <Trans>Insufficient&nbsp;{<TokenSymbol token={context.derivedState.inputCurrency} />}&nbsp;balance</Trans>
+      </TradeFormBlankButton>
+    )
+  },
+  [TradeFormValidation.ExpertApproveAndSwap]: (context) => {
+    const tokenToApprove = context.derivedState.slippageAdjustedSellAmount?.currency.wrapped
+
+    return (
+      <TradeFormBlankButton onClick={context.doTrade}>
+        <Trans>
+          Confirm (Approve&nbsp;{<TokenSymbol token={tokenToApprove} length={6} />}&nbsp;and {context.defaultText})
+        </Trans>
+      </TradeFormBlankButton>
+    )
+  },
+  [TradeFormValidation.ApproveAndSwap]: (context) => {
+    const tokenToApprove = context.derivedState.slippageAdjustedSellAmount?.currency.wrapped
+
+    return (
+      <TradeFormBlankButton onClick={context.confirmTrade}>
+        <Trans>
+          Approve&nbsp;{<TokenSymbol token={tokenToApprove} length={6} />}&nbsp;and {context.defaultText}
+        </Trans>
+      </TradeFormBlankButton>
+    )
+  },
+  [TradeFormValidation.ApproveRequired]: (context) => {
+    const amountToApprove = context.derivedState.slippageAdjustedSellAmount
+
+    if (!amountToApprove) return null
+
+    return (
+      <TradeApproveButton amountToApprove={amountToApprove}>
+        <TradeFormBlankButton disabled={true}>
+          <Trans>{context.defaultText}</Trans>
+        </TradeFormBlankButton>
+      </TradeApproveButton>
+    )
+  },
+}
diff --git a/src/modules/tradeFormValidation/services/validateTradeForm.ts b/src/modules/tradeFormValidation/services/validateTradeForm.ts
new file mode 100644
index 0000000000..ab47164060
--- /dev/null
+++ b/src/modules/tradeFormValidation/services/validateTradeForm.ts
@@ -0,0 +1,94 @@
+import { ApprovalState } from 'legacy/hooks/useApproveCallback'
+import { isAddress } from 'legacy/utils'
+
+import { isFractionFalsy } from 'utils/isFractionFalsy'
+
+import { TradeFormValidation, TradeFormValidationContext } from '../types'
+
+export function validateTradeForm(context: TradeFormValidationContext): TradeFormValidation | null {
+  const {
+    derivedTradeState,
+    approvalState,
+    isTxBundlingEnabled,
+    isWrapUnwrap,
+    isExpertMode,
+    isSupportedWallet,
+    isSafeReadonlyUser,
+    isSwapUnsupported,
+    recipientEnsAddress,
+    tradeQuote,
+    account,
+  } = context
+
+  const { inputCurrency, outputCurrency, inputCurrencyAmount, inputCurrencyBalance, outputCurrencyAmount, recipient } =
+    derivedTradeState
+
+  const approvalRequired = approvalState === ApprovalState.NOT_APPROVED || approvalState === ApprovalState.PENDING
+
+  const inputAmountIsNotSet = !inputCurrencyAmount || isFractionFalsy(inputCurrencyAmount)
+  const outputAmountIsNotSet = isFractionFalsy(outputCurrencyAmount)
+
+  if (isWrapUnwrap) {
+    if (inputAmountIsNotSet || outputAmountIsNotSet) {
+      return TradeFormValidation.WrapUnwrapAmountNotSet
+    }
+
+    return TradeFormValidation.WrapUnwrapFlow
+  }
+
+  if (!inputCurrency || !outputCurrency) {
+    return TradeFormValidation.CurrencyNotSet
+  }
+
+  if (inputAmountIsNotSet) {
+    return TradeFormValidation.InputAmountNotSet
+  }
+
+  if (recipient && !recipientEnsAddress && !isAddress(recipient)) {
+    return TradeFormValidation.RecipientInvalid
+  }
+
+  if (isSwapUnsupported) {
+    return TradeFormValidation.CurrencyNotSupported
+  }
+
+  if (tradeQuote.error) {
+    return TradeFormValidation.QuoteErrors
+  }
+
+  if (!account) {
+    return TradeFormValidation.WalletNotConnected
+  }
+
+  if (!isSupportedWallet) {
+    return TradeFormValidation.WalletNotSupported
+  }
+
+  if (isSafeReadonlyUser) {
+    return TradeFormValidation.SafeReadonlyUser
+  }
+
+  if (!tradeQuote.response) {
+    return TradeFormValidation.QuoteLoading
+  }
+
+  if (!inputCurrencyBalance) {
+    return TradeFormValidation.BalancesNotLoaded
+  }
+
+  if (inputCurrencyBalance.lessThan(inputCurrencyAmount)) {
+    return TradeFormValidation.BalanceInsufficient
+  }
+
+  if (approvalRequired) {
+    if (isTxBundlingEnabled) {
+      if (isExpertMode) {
+        return TradeFormValidation.ExpertApproveAndSwap
+      }
+      return TradeFormValidation.ApproveAndSwap
+    }
+    return TradeFormValidation.ApproveRequired
+  }
+
+  return null
+}
diff --git a/src/modules/tradeFormValidation/state/tradeFormValidationAtom.ts b/src/modules/tradeFormValidation/state/tradeFormValidationAtom.ts
new file mode 100644
index 0000000000..de7529f3e3
--- /dev/null
+++ b/src/modules/tradeFormValidation/state/tradeFormValidationAtom.ts
@@ -0,0 +1,13 @@
+import { atom } from 'jotai'
+
+import { tradeFormValidationContextAtom } from './tradeFormValidationContextAtom'
+
+import { validateTradeForm } from '../services/validateTradeForm'
+
+export const tradeFormValidationAtom = atom((get) => {
+  const context = get(tradeFormValidationContextAtom)
+
+  if (!context) return null
+
+  return validateTradeForm(context)
+})
diff --git a/src/modules/tradeFormValidation/state/tradeFormValidationContextAtom.ts b/src/modules/tradeFormValidation/state/tradeFormValidationContextAtom.ts
new file mode 100644
index 0000000000..f422632a8b
--- /dev/null
+++ b/src/modules/tradeFormValidation/state/tradeFormValidationContextAtom.ts
@@ -0,0 +1,5 @@
+import { atom } from 'jotai'
+
+import { TradeFormValidationContext } from '../types'
+
+export const tradeFormValidationContextAtom = atom<TradeFormValidationContext | null>(null)
diff --git a/src/modules/tradeFormValidation/types.ts b/src/modules/tradeFormValidation/types.ts
new file mode 100644
index 0000000000..4d1af1bc8e
--- /dev/null
+++ b/src/modules/tradeFormValidation/types.ts
@@ -0,0 +1,68 @@
+import { ApprovalState } from 'legacy/hooks/useApproveCallback'
+
+import { TradeDerivedState } from 'modules/trade'
+import { TradeQuoteState } from 'modules/tradeQuote'
+
+export enum TradeFormValidation {
+  // Wrap/unwrap
+  WrapUnwrapAmountNotSet,
+  WrapUnwrapFlow,
+
+  // Quote request params
+  CurrencyNotSet,
+  InputAmountNotSet,
+  RecipientInvalid,
+
+  // Quote errors
+  QuoteErrors,
+  CurrencyNotSupported,
+
+  // Wallet
+  WalletNotConnected,
+  WalletNotSupported,
+  SafeReadonlyUser,
+
+  // Quote loading indicator
+  QuoteLoading,
+
+  // Balances
+  BalancesNotLoaded,
+  BalanceInsufficient,
+
+  // Approve
+  ExpertApproveAndSwap,
+  ApproveAndSwap,
+  ApproveRequired,
+}
+
+export interface TradeFormValidationLocalContext {
+  isExpertMode: boolean
+}
+
+export interface TradeFormValidationCommonContext {
+  account: string | undefined
+  derivedTradeState: TradeDerivedState
+  approvalState: ApprovalState
+  tradeQuote: TradeQuoteState
+  recipientEnsAddress: string | null
+  isWrapUnwrap: boolean
+  isTxBundlingEnabled: boolean
+  isSupportedWallet: boolean
+  isSwapUnsupported: boolean
+  isSafeReadonlyUser: boolean
+}
+
+export interface TradeFormValidationContext extends TradeFormValidationLocalContext, TradeFormValidationCommonContext {}
+
+export interface TradeFormButtonContext {
+  defaultText: string
+  derivedState: TradeDerivedState
+  quote: TradeQuoteState
+  isSupportedWallet: boolean
+
+  doTrade(): void
+
+  confirmTrade(): void
+
+  connectWallet(): void
+}
diff --git a/src/modules/tradeFormValidation/updaters/TradeFormValidationUpdater.ts b/src/modules/tradeFormValidation/updaters/TradeFormValidationUpdater.ts
new file mode 100644
index 0000000000..6d7a826999
--- /dev/null
+++ b/src/modules/tradeFormValidation/updaters/TradeFormValidationUpdater.ts
@@ -0,0 +1,22 @@
+import { useUpdateAtom } from 'jotai/utils'
+import { useEffect, useMemo } from 'react'
+
+import { useTradeFormValidationContext } from '../hooks/useTradeFormValidationContext'
+import { tradeFormValidationContextAtom } from '../state/tradeFormValidationContextAtom'
+
+export function TradeFormValidationUpdater({ isExpertMode }: { isExpertMode: boolean }) {
+  const updateContext = useUpdateAtom(tradeFormValidationContextAtom)
+  const localContext = useMemo(() => ({ isExpertMode }), [isExpertMode])
+  const commonContext = useTradeFormValidationContext()
+
+  useEffect(() => {
+    if (!commonContext) return
+
+    updateContext({
+      ...commonContext,
+      ...localContext,
+    })
+  }, [commonContext, localContext, updateContext])
+
+  return null
+}
diff --git a/src/modules/tradeQuote/hooks/useTradeQuotePolling.ts b/src/modules/tradeQuote/hooks/useTradeQuotePolling.ts
index 2cbacc507e..25a5ba8256 100644
--- a/src/modules/tradeQuote/hooks/useTradeQuotePolling.ts
+++ b/src/modules/tradeQuote/hooks/useTradeQuotePolling.ts
@@ -33,7 +33,7 @@ export function useTradeQuotePolling() {
     }
 
     const fetchQuote = () => {
-      updateQuoteState({ isLoading: true })
+      updateQuoteState({ isLoading: true, error: null })
 
       getQuoteOnlyResolveLast(quoteParams)
         .then((response) => {
@@ -43,7 +43,7 @@ export function useTradeQuotePolling() {
             return
           }
 
-          updateQuoteState({ response: data, isLoading: false })
+          updateQuoteState({ response: data, isLoading: false, error: null })
         })
         .catch((error: GpQuoteError) => {
           console.log('[useGetQuote]:: fetchQuote error', error)
diff --git a/src/pages/LimitOrders/index.tsx b/src/pages/LimitOrders/index.tsx
index 7432537606..1dca417d72 100644
--- a/src/pages/LimitOrders/index.tsx
+++ b/src/pages/LimitOrders/index.tsx
@@ -6,18 +6,22 @@ import {
   InitialPriceUpdater,
   ExecutionPriceUpdater,
   limitOrdersRawStateAtom,
+  limitOrdersSettingsAtom,
 } from 'modules/limitOrders'
 import { OrdersTableWidget } from 'modules/ordersTable'
 import * as styledEl from 'modules/trade/pure/TradePageLayout'
+import { TradeFormValidationUpdater } from 'modules/tradeFormValidation'
 
 export default function LimitOrderPage() {
   const { isUnlocked } = useAtomValue(limitOrdersRawStateAtom)
+  const { expertMode } = useAtomValue(limitOrdersSettingsAtom)
 
   return (
     <>
       <QuoteObserverUpdater />
       <InitialPriceUpdater />
       <ExecutionPriceUpdater />
+      <TradeFormValidationUpdater isExpertMode={expertMode} />
 
       <styledEl.PageWrapper isUnlocked={isUnlocked}>
         <styledEl.PrimaryWrapper>

From 5d77169b38cc074cf5f6ad093426d8969847e111 Mon Sep 17 00:00:00 2001
From: Alexandr Kazachenko <shoom3301@gmail.com>
Date: Tue, 6 Jun 2023 14:04:22 +0600
Subject: [PATCH 03/67] [2] refactor(trade): add wrap native token flow to
 TradeWidget (#2591)

---
 src/legacy/hooks/useWrapCallback.ts           | 112 +++++++-----------
 .../containers/TradeButtons/index.tsx         |   4 +-
 .../swap/hooks/useSwapButtonContext.ts        |  42 ++++++-
 .../trade/containers/TradeWidget/index.tsx    |   3 +
 .../containers/WrapNativeModal/index.tsx      |  64 ++++++++++
 .../trade/hooks/useSwitchTokensPlaces.ts      |  20 ++--
 src/modules/trade/hooks/useWrapNativeFlow.ts  |  68 +++++++++++
 src/modules/trade/index.ts                    |   1 +
 .../trade/state/wrapNativeStateAtom.ts        |   9 ++
 .../pure/TradeFormButtons/tradeButtonsMap.tsx |  11 +-
 src/modules/tradeFormValidation/types.ts      |   3 +-
 11 files changed, 245 insertions(+), 92 deletions(-)
 create mode 100644 src/modules/trade/containers/WrapNativeModal/index.tsx
 create mode 100644 src/modules/trade/hooks/useWrapNativeFlow.ts
 create mode 100644 src/modules/trade/state/wrapNativeStateAtom.ts

diff --git a/src/legacy/hooks/useWrapCallback.ts b/src/legacy/hooks/useWrapCallback.ts
index 4b2f7da2c5..5a1d65894a 100644
--- a/src/legacy/hooks/useWrapCallback.ts
+++ b/src/legacy/hooks/useWrapCallback.ts
@@ -1,9 +1,10 @@
+import { SupportedChainId } from '@cowprotocol/cow-sdk'
 import { BigNumber } from '@ethersproject/bignumber'
 import { Contract } from '@ethersproject/contracts'
 import { TransactionResponse } from '@ethersproject/providers'
 import { Currency, CurrencyAmount } from '@uniswap/sdk-core'
 
-import { t } from '@lingui/macro'
+import { Nullish } from 'types'
 
 import { wrapAnalytics } from 'legacy/components/analytics'
 import { ConfirmOperationType } from 'legacy/components/TransactionConfirmationModal'
@@ -12,18 +13,14 @@ import { RADIX_HEX } from 'legacy/constants'
 import { useWETHContract } from 'legacy/hooks/useContract'
 import { useCloseModals } from 'legacy/state/application/hooks'
 import { useTransactionAdder } from 'legacy/state/enhancedTransactions/hooks'
-import { useDerivedSwapInfo } from 'legacy/state/swap/hooks'
 import { calculateGasMargin } from 'legacy/utils/calculateGasMargin'
 import { getChainCurrencySymbols } from 'legacy/utils/gnosis_chain/hack'
 
 import { useTransactionConfirmModal } from 'modules/swap/hooks/useTransactionConfirmModal'
-import useCurrencyBalance from 'modules/tokens/hooks/useCurrencyBalance'
-import { useIsNativeIn } from 'modules/trade/hooks/useIsNativeInOrOut'
 import { useNativeTokenContext } from 'modules/trade/hooks/useNativeTokenContext'
 import { useWalletInfo } from 'modules/wallet'
 
 import { formatTokenAmount } from 'utils/amountFormat'
-import { formatSymbol } from 'utils/format'
 
 import { isRejectRequestProviderError } from '../utils/misc'
 
@@ -46,27 +43,21 @@ type TransactionAdder = ReturnType<typeof useTransactionAdder>
 
 export type OpenSwapConfirmModalCallback = (message: string, operationType: ConfirmOperationType) => void
 
-export interface WrapUnwrapContext {
-  wrapType: WrapType
-  wethContract: Contract
-  amountHex: string
+export interface WrapDescription {
   confirmationMessage: string
   operationMessage: string
   summary: string
+}
+
+export interface WrapUnwrapContext {
+  chainId: SupportedChainId
+  wethContract: Contract
+  amount: CurrencyAmount<Currency>
   addTransaction: TransactionAdder
   closeModals: () => void
   openTransactionConfirmationModal: OpenSwapConfirmModalCallback
 }
 
-export function useHasEnoughWrappedBalanceForSwap(inputAmount?: CurrencyAmount<Currency>): boolean {
-  const { currencies } = useDerivedSwapInfo()
-  const { account } = useWalletInfo()
-  const wrappedBalance = useCurrencyBalance(account ?? undefined, currencies.INPUT?.wrapped)
-
-  // is an native currency trade but wrapped token has enough balance
-  return !!(wrappedBalance && inputAmount && !wrappedBalance.lessThan(inputAmount))
-}
-
 export function useWrapType(): WrapType {
   const { isNativeIn, isNativeOut, isWrappedIn, isWrappedOut } = useNativeTokenContext()
 
@@ -81,35 +72,11 @@ export function useWrapType(): WrapType {
   return isNativeIn ? WrapType.WRAP : WrapType.UNWRAP
 }
 
-export function useWrapUnwrapError(wrapType: WrapType, inputAmount?: CurrencyAmount<Currency>): string | undefined {
-  const { chainId, account } = useWalletInfo()
-  const { currencies } = useDerivedSwapInfo()
-  const { native, wrapped } = getChainCurrencySymbols(chainId)
-  const balance = useCurrencyBalance(account ?? undefined, currencies.INPUT)
-
-  const symbol = wrapType === WrapType.WRAP ? native : wrapped
-  // Check if user has enough balance for wrap/unwrap
-  const sufficientBalance = !!(inputAmount && balance && !balance.lessThan(inputAmount))
-  const isZero = balance && !inputAmount
-
-  if (isZero) {
-    return t`Enter an amount`
-  }
-
-  return !sufficientBalance ? t`Insufficient ${formatSymbol(symbol)} balance` : undefined
-}
-
-export function useWrapUnwrapContext(
-  inputAmount: CurrencyAmount<Currency> | null | undefined
-): WrapUnwrapContext | null {
+export function useWrapUnwrapContext(inputAmount: Nullish<CurrencyAmount<Currency>>): WrapUnwrapContext | null {
   const { chainId } = useWalletInfo()
   const closeModals = useCloseModals()
   const wethContract = useWETHContract()
-  const { native, wrapped } = getChainCurrencySymbols(chainId)
-  const isNativeIn = useIsNativeIn()
   const addTransaction = useTransactionAdder()
-  const wrapType = isNativeIn ? WrapType.WRAP : WrapType.UNWRAP
-  const isWrap = isNativeIn
   const openTxConfirmationModal = useTransactionConfirmModal()
 
   if (!wethContract || !chainId || !inputAmount) {
@@ -119,23 +86,13 @@ export function useWrapUnwrapContext(
   const openTransactionConfirmationModal = (pendingText: string, operationType: ConfirmOperationType) => {
     openTxConfirmationModal({ operationType, pendingText })
   }
-  const amountHex = `0x${inputAmount.quotient.toString(RADIX_HEX)}`
-  const operationType = isWrap ? ConfirmOperationType.WRAP_ETHER : ConfirmOperationType.UNWRAP_WETH
-  const baseSummarySuffix = isWrap ? `${native} to ${wrapped}` : `${wrapped} to ${native}`
-  const baseSummary = `${formatTokenAmount(inputAmount)} ${baseSummarySuffix}`
-  const summary = `${isWrap ? 'Wrap' : 'Unwrap'} ${baseSummary}`
-  const confirmationMessage = `${isWrap ? 'Wrapping' : 'Unwrapping'} ${baseSummary}`
-  const operationMessage = getOperationMessage(operationType, chainId)
 
   return {
-    wrapType,
-    closeModals,
+    chainId,
     wethContract,
-    amountHex,
-    summary,
-    confirmationMessage,
-    operationMessage,
+    amount: inputAmount,
     addTransaction,
+    closeModals,
     openTransactionConfirmationModal,
   }
 }
@@ -159,26 +116,19 @@ export async function wrapUnwrapCallback(
   context: WrapUnwrapContext,
   params: WrapUnwrapCallbackParams = { useModals: true }
 ): Promise<TransactionResponse | null> {
-  const { useModals } = params
-  const {
-    wrapType,
-    openTransactionConfirmationModal,
-    confirmationMessage,
-    operationMessage,
-    summary,
-    wethContract,
-    amountHex,
-    addTransaction,
-    closeModals,
-  } = context
-  const isWrap = wrapType === WrapType.WRAP
-  const operationType = isWrap ? ConfirmOperationType.WRAP_ETHER : ConfirmOperationType.UNWRAP_WETH
+  const { chainId, amount, wethContract, addTransaction, openTransactionConfirmationModal, closeModals } = context
+  const isNativeIn = amount.currency.isNative
+  const amountHex = `0x${amount.quotient.toString(RADIX_HEX)}`
+  const operationType = isNativeIn ? ConfirmOperationType.WRAP_ETHER : ConfirmOperationType.UNWRAP_WETH
+
+  const useModals = params.useModals
+  const { confirmationMessage, operationMessage, summary } = getWrapDescription(chainId, isNativeIn, amount)
 
   try {
     useModals && openTransactionConfirmationModal(confirmationMessage, operationType)
     wrapAnalytics('Send', operationMessage)
 
-    const wrapUnwrap = isWrap ? wrapContractCall : unwrapContractCall
+    const wrapUnwrap = isNativeIn ? wrapContractCall : unwrapContractCall
     const txReceipt = await wrapUnwrap(wethContract, amountHex)
     wrapAnalytics('Sign', operationMessage)
 
@@ -207,6 +157,26 @@ export async function wrapUnwrapCallback(
   }
 }
 
+function getWrapDescription(
+  chainId: SupportedChainId,
+  isWrap: boolean,
+  inputAmount: CurrencyAmount<Currency>
+): WrapDescription {
+  const { native, wrapped } = getChainCurrencySymbols(chainId)
+  const operationType = isWrap ? ConfirmOperationType.WRAP_ETHER : ConfirmOperationType.UNWRAP_WETH
+  const baseSummarySuffix = isWrap ? `${native} to ${wrapped}` : `${wrapped} to ${native}`
+  const baseSummary = `${formatTokenAmount(inputAmount)} ${baseSummarySuffix}`
+  const summary = `${isWrap ? 'Wrap' : 'Unwrap'} ${baseSummary}`
+  const confirmationMessage = `${isWrap ? 'Wrapping' : 'Unwrapping'} ${baseSummary}`
+  const operationMessage = getOperationMessage(operationType, chainId)
+
+  return {
+    summary,
+    operationMessage,
+    confirmationMessage,
+  }
+}
+
 async function wrapContractCall(wethContract: Contract, amountHex: string): Promise<TransactionResponse> {
   const estimatedGas = await wethContract.estimateGas.deposit({ value: amountHex }).catch(_handleGasEstimateError)
   const gasLimit = calculateGasMargin(estimatedGas)
diff --git a/src/modules/limitOrders/containers/TradeButtons/index.tsx b/src/modules/limitOrders/containers/TradeButtons/index.tsx
index 05a447b1a4..ac904483a5 100644
--- a/src/modules/limitOrders/containers/TradeButtons/index.tsx
+++ b/src/modules/limitOrders/containers/TradeButtons/index.tsx
@@ -11,7 +11,7 @@ import { useLimitOrdersDerivedState } from 'modules/limitOrders/hooks/useLimitOr
 import { useLimitOrdersWarningsAccepted } from 'modules/limitOrders/hooks/useLimitOrdersWarningsAccepted'
 import { TradeFlowContext } from 'modules/limitOrders/services/types'
 import { limitOrdersSettingsAtom } from 'modules/limitOrders/state/limitOrdersSettingsAtom'
-import { useTradeConfirmActions } from 'modules/trade/hooks/useTradeConfirmActions'
+import { useTradeConfirmActions, useWrapNativeFlow } from 'modules/trade'
 import {
   TradeFormButtons,
   useGetTradeFormValidation,
@@ -42,6 +42,7 @@ export function TradeButtons(props: TradeButtonsProps) {
   const warningsAccepted = useLimitOrdersWarningsAccepted(false)
   const { isSupportedWallet } = useWalletDetails()
   const tradeConfirmActions = useTradeConfirmActions()
+  const wrapNativeFlow = useWrapNativeFlow()
 
   const handleTrade = useHandleOrderPlacement(tradeContext, priceImpact, settingsState, tradeConfirmActions)
 
@@ -53,6 +54,7 @@ export function TradeButtons(props: TradeButtonsProps) {
     doTrade: handleTrade,
     quote,
     isSupportedWallet,
+    wrapNativeFlow,
     confirmTrade() {
       tradeConfirmActions.onOpen()
     },
diff --git a/src/modules/swap/hooks/useSwapButtonContext.ts b/src/modules/swap/hooks/useSwapButtonContext.ts
index 7b8fc18f0e..7d9868f1c6 100644
--- a/src/modules/swap/hooks/useSwapButtonContext.ts
+++ b/src/modules/swap/hooks/useSwapButtonContext.ts
@@ -1,16 +1,16 @@
+import { Currency, CurrencyAmount } from '@uniswap/sdk-core'
+
+import { t } from '@lingui/macro'
+
 import { PriceImpact } from 'legacy/hooks/usePriceImpact'
-import {
-  useHasEnoughWrappedBalanceForSwap,
-  useWrapCallback,
-  useWrapType,
-  useWrapUnwrapError,
-} from 'legacy/hooks/useWrapCallback'
+import { useWrapCallback, useWrapType, WrapType } from 'legacy/hooks/useWrapCallback'
 import { useToggleWalletModal } from 'legacy/state/application/hooks'
 import { useIsTradeUnsupported } from 'legacy/state/lists/hooks'
 import { useGetQuoteAndStatus, useIsBestQuoteLoading } from 'legacy/state/price/hooks'
 import { Field } from 'legacy/state/swap/actions'
 import { useDerivedSwapInfo, useSwapActionHandlers } from 'legacy/state/swap/hooks'
 import { useExpertModeManager } from 'legacy/state/user/hooks'
+import { getChainCurrencySymbols } from 'legacy/utils/gnosis_chain/hack'
 
 import { getSwapButtonState } from 'modules/swap/helpers/getSwapButtonState'
 import { useEthFlowContext } from 'modules/swap/hooks/useEthFlowContext'
@@ -19,6 +19,7 @@ import { useSafeBundleApprovalFlowContext } from 'modules/swap/hooks/useSafeBund
 import { useSwapConfirmManager } from 'modules/swap/hooks/useSwapConfirmManager'
 import { useSwapFlowContext } from 'modules/swap/hooks/useSwapFlowContext'
 import { SwapButtonsContext } from 'modules/swap/pure/SwapButtons'
+import useCurrencyBalance from 'modules/tokens/hooks/useCurrencyBalance'
 import { useIsNativeIn } from 'modules/trade/hooks/useIsNativeInOrOut'
 import { useIsWrappedOut } from 'modules/trade/hooks/useIsWrappedInOrOut'
 import { useWrappedToken } from 'modules/trade/hooks/useWrappedToken'
@@ -28,6 +29,7 @@ import { useTradeApproveState } from 'common/containers/TradeApprove/useTradeApp
 import { useIsEthFlowBundlingEnabled } from 'common/hooks/useIsEthFlowBundlingEnabled'
 import { useIsSmartContractWallet } from 'common/hooks/useIsSmartContractWallet'
 import { useIsTxBundlingEnabled } from 'common/hooks/useIsTxBundlingEnabled'
+import { formatSymbol } from 'utils/format'
 
 import { useSafeBundleEthFlowContext } from './useSafeBundleEthFlowContext'
 
@@ -139,3 +141,31 @@ export function useSwapButtonContext(input: SwapButtonInput): SwapButtonsContext
     onCurrencySelection,
   }
 }
+
+// TODO: get rid of it. The validation should be handled by modules/tradeFormValidation
+function useWrapUnwrapError(wrapType: WrapType, inputAmount?: CurrencyAmount<Currency>): string | undefined {
+  const { chainId, account } = useWalletInfo()
+  const { currencies } = useDerivedSwapInfo()
+  const { native, wrapped } = getChainCurrencySymbols(chainId)
+  const balance = useCurrencyBalance(account ?? undefined, currencies.INPUT)
+
+  const symbol = wrapType === WrapType.WRAP ? native : wrapped
+  // Check if user has enough balance for wrap/unwrap
+  const sufficientBalance = !!(inputAmount && balance && !balance.lessThan(inputAmount))
+  const isZero = balance && !inputAmount
+
+  if (isZero) {
+    return t`Enter an amount`
+  }
+
+  return !sufficientBalance ? t`Insufficient ${formatSymbol(symbol)} balance` : undefined
+}
+
+function useHasEnoughWrappedBalanceForSwap(inputAmount?: CurrencyAmount<Currency>): boolean {
+  const { currencies } = useDerivedSwapInfo()
+  const { account } = useWalletInfo()
+  const wrappedBalance = useCurrencyBalance(account ?? undefined, currencies.INPUT?.wrapped)
+
+  // is an native currency trade but wrapped token has enough balance
+  return !!(wrappedBalance && inputAmount && !wrappedBalance.lessThan(inputAmount))
+}
diff --git a/src/modules/trade/containers/TradeWidget/index.tsx b/src/modules/trade/containers/TradeWidget/index.tsx
index ca6368cecd..36c75529c0 100644
--- a/src/modules/trade/containers/TradeWidget/index.tsx
+++ b/src/modules/trade/containers/TradeWidget/index.tsx
@@ -19,6 +19,8 @@ import { CurrencyInfo } from 'common/pure/CurrencyInputPanel/types'
 import * as styledEl from './styled'
 import { TradeWidgetModals } from './TradeWidgetModals'
 
+import { WrapNativeModal } from '../WrapNativeModal'
+
 export interface TradeWidgetActions {
   onCurrencySelection: CurrencyInputPanelProps['onCurrencySelection']
   onUserInput: CurrencyInputPanelProps['onUserInput']
@@ -99,6 +101,7 @@ export function TradeWidget(props: TradeWidgetProps) {
     <styledEl.Container id={id}>
       {!disableQuotePolling && <TradeQuoteUpdater />}
       <TradeWidgetModals />
+      <WrapNativeModal />
 
       <styledEl.Container id={id}>
         <styledEl.ContainerBox>
diff --git a/src/modules/trade/containers/WrapNativeModal/index.tsx b/src/modules/trade/containers/WrapNativeModal/index.tsx
new file mode 100644
index 0000000000..8ae0d04fed
--- /dev/null
+++ b/src/modules/trade/containers/WrapNativeModal/index.tsx
@@ -0,0 +1,64 @@
+import { useAtom } from 'jotai'
+import { useCallback } from 'react'
+
+import { useWalletDisplayedAddress } from 'modules/wallet'
+
+import { useWalletStatusIcon } from 'common/hooks/useWalletStatusIcon'
+import { ConfirmationPendingContent } from 'common/pure/ConfirmationPendingContent'
+import { GpModal } from 'common/pure/Modal'
+import { TokenAmount } from 'common/pure/TokenAmount'
+import { TokenSymbol } from 'common/pure/TokenSymbol'
+
+import { useDerivedTradeState } from '../../hooks/useDerivedTradeState'
+import { wrapNativeStateAtom } from '../../state/wrapNativeStateAtom'
+
+export function WrapNativeModal() {
+  const [{ isOpen }, setWrapNativeState] = useAtom(wrapNativeStateAtom)
+
+  const derivedState = useDerivedTradeState()
+  const walletAddress = useWalletDisplayedAddress()
+  const statusIcon = useWalletStatusIcon()
+
+  const { inputCurrencyAmount, outputCurrency } = derivedState.state || {}
+
+  const handleDismiss = useCallback(() => {
+    setWrapNativeState({ isOpen: false })
+  }, [setWrapNativeState])
+
+  const inputCurrency = inputCurrencyAmount?.currency
+  const isNativeIn = !!inputCurrency?.isNative
+
+  const title = isNativeIn ? (
+    <span>
+      Wrapping <TokenAmount amount={inputCurrencyAmount} tokenSymbol={inputCurrency} /> to{' '}
+      <TokenSymbol token={outputCurrency} />
+    </span>
+  ) : (
+    <span>
+      Unwrapping <TokenAmount amount={inputCurrencyAmount} tokenSymbol={inputCurrency} /> to{' '}
+      <TokenSymbol token={outputCurrency} />
+    </span>
+  )
+
+  const description = (
+    <span>
+      Unwrapping <TokenSymbol token={inputCurrency} /> <br /> Follow these steps:
+    </span>
+  )
+
+  const operationLabel = isNativeIn ? 'wrapping' : 'unwrapping'
+
+  return (
+    <GpModal isOpen={isOpen} onDismiss={handleDismiss}>
+      <ConfirmationPendingContent
+        onDismiss={handleDismiss}
+        statusIcon={statusIcon}
+        title={title}
+        description={description}
+        operationSubmittedMessage={`The ${operationLabel} is submitted.`}
+        walletAddress={walletAddress}
+        operationLabel={operationLabel}
+      />
+    </GpModal>
+  )
+}
diff --git a/src/modules/trade/hooks/useSwitchTokensPlaces.ts b/src/modules/trade/hooks/useSwitchTokensPlaces.ts
index 49a6b5c02c..f99e14322b 100644
--- a/src/modules/trade/hooks/useSwitchTokensPlaces.ts
+++ b/src/modules/trade/hooks/useSwitchTokensPlaces.ts
@@ -25,15 +25,17 @@ export function useSwitchTokensPlaces(stateOverride: Partial<ExtendedTradeRawSta
 
   return useCallback(() => {
     if (!inputCurrencyId || !outputCurrencyId || !updateState) return
-    if (isWrapOrUnwrap) return
-
-    updateState({
-      inputCurrencyId: outputCurrencyId,
-      outputCurrencyId: inputCurrencyId,
-      inputCurrencyAmount: FractionUtils.serializeFractionToJSON(outputCurrencyAmount),
-      outputCurrencyAmount: FractionUtils.serializeFractionToJSON(inputCurrencyAmount),
-      ...stateOverride,
-    })
+
+    if (!isWrapOrUnwrap) {
+      updateState({
+        inputCurrencyId: outputCurrencyId,
+        outputCurrencyId: inputCurrencyId,
+        inputCurrencyAmount: FractionUtils.serializeFractionToJSON(outputCurrencyAmount),
+        outputCurrencyAmount: FractionUtils.serializeFractionToJSON(inputCurrencyAmount),
+        ...stateOverride,
+      })
+    }
+
     tradeNavigate(chainId, { inputCurrencyId: outputCurrencyId, outputCurrencyId: inputCurrencyId })
   }, [
     updateState,
diff --git a/src/modules/trade/hooks/useWrapNativeFlow.ts b/src/modules/trade/hooks/useWrapNativeFlow.ts
new file mode 100644
index 0000000000..c30550825a
--- /dev/null
+++ b/src/modules/trade/hooks/useWrapNativeFlow.ts
@@ -0,0 +1,68 @@
+import { useUpdateAtom } from 'jotai/utils'
+import { useCallback } from 'react'
+
+import { Currency, CurrencyAmount } from '@uniswap/sdk-core'
+
+import { Nullish } from 'types'
+
+import { useWETHContract } from 'legacy/hooks/useContract'
+import {
+  wrapUnwrapCallback,
+  WrapUnwrapCallback,
+  WrapUnwrapCallbackParams,
+  WrapUnwrapContext,
+} from 'legacy/hooks/useWrapCallback'
+import { useTransactionAdder } from 'legacy/state/enhancedTransactions/hooks'
+
+import { useWalletInfo } from 'modules/wallet'
+
+import { useDerivedTradeState } from './useDerivedTradeState'
+
+import { wrapNativeStateAtom } from '../state/wrapNativeStateAtom'
+
+export function useWrapNativeFlow() {
+  const setWrapNativeState = useUpdateAtom(wrapNativeStateAtom)
+  const derivedTradeState = useDerivedTradeState()
+  const wrapCallback = useWrapNativeCallback(derivedTradeState.state?.inputCurrencyAmount)
+
+  return useCallback(() => {
+    setWrapNativeState({ isOpen: true })
+    wrapCallback?.()
+  }, [setWrapNativeState, wrapCallback])
+}
+
+function useWrapNativeContext(amount: Nullish<CurrencyAmount<Currency>>): WrapUnwrapContext | null {
+  const { chainId } = useWalletInfo()
+  const wethContract = useWETHContract()
+  const addTransaction = useTransactionAdder()
+  const setWrapNativeState = useUpdateAtom(wrapNativeStateAtom)
+
+  if (!wethContract || !chainId || !amount) {
+    return null
+  }
+
+  return {
+    chainId,
+    wethContract,
+    amount,
+    addTransaction,
+    closeModals() {
+      setWrapNativeState({ isOpen: false })
+    },
+    openTransactionConfirmationModal() {
+      setWrapNativeState({ isOpen: true })
+    },
+  }
+}
+
+function useWrapNativeCallback(inputAmount: Nullish<CurrencyAmount<Currency>>): WrapUnwrapCallback | null {
+  const context = useWrapNativeContext(inputAmount)
+
+  if (!context) {
+    return null
+  }
+
+  return (params?: WrapUnwrapCallbackParams) => {
+    return wrapUnwrapCallback(context, params)
+  }
+}
diff --git a/src/modules/trade/index.ts b/src/modules/trade/index.ts
index 881ffef03d..d0a42fe9bc 100644
--- a/src/modules/trade/index.ts
+++ b/src/modules/trade/index.ts
@@ -4,4 +4,5 @@ export * from './pure/TradeConfirmation'
 export * from './hooks/useTradeConfirmActions'
 export * from './hooks/useTradeTypeInfo'
 export * from './hooks/setupTradeState/useSetupTradeState'
+export * from './hooks/useWrapNativeFlow'
 export * from './types/TradeDerivedState'
diff --git a/src/modules/trade/state/wrapNativeStateAtom.ts b/src/modules/trade/state/wrapNativeStateAtom.ts
new file mode 100644
index 0000000000..4b4d33fe67
--- /dev/null
+++ b/src/modules/trade/state/wrapNativeStateAtom.ts
@@ -0,0 +1,9 @@
+import { atom } from 'jotai'
+
+interface WrapNativeState {
+  isOpen: boolean
+}
+
+export const wrapNativeStateAtom = atom<WrapNativeState>({
+  isOpen: false,
+})
diff --git a/src/modules/tradeFormValidation/pure/TradeFormButtons/tradeButtonsMap.tsx b/src/modules/tradeFormValidation/pure/TradeFormButtons/tradeButtonsMap.tsx
index 7d2184f314..cc034a60aa 100644
--- a/src/modules/tradeFormValidation/pure/TradeFormButtons/tradeButtonsMap.tsx
+++ b/src/modules/tradeFormValidation/pure/TradeFormButtons/tradeButtonsMap.tsx
@@ -40,9 +40,14 @@ export const tradeButtonsMap: Record<TradeFormValidation, ButtonErrorConfig | Bu
   [TradeFormValidation.WrapUnwrapAmountNotSet]: {
     text: 'Enter an amount',
   },
-  // TODO: implement
-  [TradeFormValidation.WrapUnwrapFlow]: {
-    text: 'Wrap or unwrap',
+  [TradeFormValidation.WrapUnwrapFlow]: (context) => {
+    const isNativeIn = !!context.derivedState.inputCurrency?.isNative
+
+    return (
+      <TradeFormBlankButton onClick={context.wrapNativeFlow}>
+        <Trans>{isNativeIn ? 'Wrap' : 'Unwrap'}</Trans>
+      </TradeFormBlankButton>
+    )
   },
   [TradeFormValidation.CurrencyNotSet]: {
     text: 'Select a token',
diff --git a/src/modules/tradeFormValidation/types.ts b/src/modules/tradeFormValidation/types.ts
index 4d1af1bc8e..0ef075cf36 100644
--- a/src/modules/tradeFormValidation/types.ts
+++ b/src/modules/tradeFormValidation/types.ts
@@ -61,8 +61,7 @@ export interface TradeFormButtonContext {
   isSupportedWallet: boolean
 
   doTrade(): void
-
   confirmTrade(): void
-
   connectWallet(): void
+  wrapNativeFlow(): void
 }

From bccacb60cb9e53c1935da727c0900a5e9f1c4cfc Mon Sep 17 00:00:00 2001
From: Alexandr Kazachenko <shoom3301@gmail.com>
Date: Tue, 6 Jun 2023 14:09:44 +0600
Subject: [PATCH 04/67] feat(twap): add generic trade form validation to TWAP
 (#2592)

---
 .../containers/TradeButtons/index.tsx         | 32 +++-----------
 .../hooks/useTradeFormButtonContext.ts        | 42 ++++++++++++++++++
 src/modules/tradeFormValidation/index.ts      |  1 +
 .../twap/containers/ActionButtons/index.tsx   | 43 +++++++++++++++++++
 .../twap/containers/TwapFormWidget/index.tsx  | 16 +------
 src/modules/twap/hooks/useTwapFormState.ts    |  2 +-
 .../PrimaryActionButton/getTwapFormState.tsx  | 13 +++---
 .../twap/pure/PrimaryActionButton/index.tsx   |  2 +-
 src/pages/AdvancedOrders/index.tsx            |  4 ++
 9 files changed, 106 insertions(+), 49 deletions(-)
 create mode 100644 src/modules/tradeFormValidation/hooks/useTradeFormButtonContext.ts
 create mode 100644 src/modules/twap/containers/ActionButtons/index.tsx

diff --git a/src/modules/limitOrders/containers/TradeButtons/index.tsx b/src/modules/limitOrders/containers/TradeButtons/index.tsx
index ac904483a5..3396890436 100644
--- a/src/modules/limitOrders/containers/TradeButtons/index.tsx
+++ b/src/modules/limitOrders/containers/TradeButtons/index.tsx
@@ -4,22 +4,18 @@ import React from 'react'
 import { Trans } from '@lingui/macro'
 
 import { PriceImpact } from 'legacy/hooks/usePriceImpact'
-import { useToggleWalletModal } from 'legacy/state/application/hooks'
 
 import { useHandleOrderPlacement } from 'modules/limitOrders/hooks/useHandleOrderPlacement'
-import { useLimitOrdersDerivedState } from 'modules/limitOrders/hooks/useLimitOrdersDerivedState'
 import { useLimitOrdersWarningsAccepted } from 'modules/limitOrders/hooks/useLimitOrdersWarningsAccepted'
 import { TradeFlowContext } from 'modules/limitOrders/services/types'
 import { limitOrdersSettingsAtom } from 'modules/limitOrders/state/limitOrdersSettingsAtom'
-import { useTradeConfirmActions, useWrapNativeFlow } from 'modules/trade'
+import { useTradeConfirmActions } from 'modules/trade'
 import {
   TradeFormButtons,
   useGetTradeFormValidation,
+  useTradeFormButtonContext,
   TradeFormBlankButton,
-  TradeFormButtonContext,
 } from 'modules/tradeFormValidation'
-import { useTradeQuote } from 'modules/tradeQuote'
-import { useWalletDetails } from 'modules/wallet'
 
 import { limitOrdersTradeButtonsMap } from './limitOrdersTradeButtonsMap'
 
@@ -36,32 +32,16 @@ export function TradeButtons(props: TradeButtonsProps) {
   const settingsState = useAtomValue(limitOrdersSettingsAtom)
   const localFormValidation = useLimitOrdersFormState()
   const primaryFormValidation = useGetTradeFormValidation()
-  const tradeState = useLimitOrdersDerivedState()
-  const toggleWalletModal = useToggleWalletModal()
-  const quote = useTradeQuote()
   const warningsAccepted = useLimitOrdersWarningsAccepted(false)
-  const { isSupportedWallet } = useWalletDetails()
   const tradeConfirmActions = useTradeConfirmActions()
-  const wrapNativeFlow = useWrapNativeFlow()
 
   const handleTrade = useHandleOrderPlacement(tradeContext, priceImpact, settingsState, tradeConfirmActions)
-
+  const confirmTrade = tradeConfirmActions.onOpen
   const isExpertMode = settingsState.expertMode
 
-  const tradeFormButtonContext: TradeFormButtonContext = {
-    defaultText: 'Limit order',
-    derivedState: tradeState,
-    doTrade: handleTrade,
-    quote,
-    isSupportedWallet,
-    wrapNativeFlow,
-    confirmTrade() {
-      tradeConfirmActions.onOpen()
-    },
-    connectWallet() {
-      toggleWalletModal()
-    },
-  }
+  const tradeFormButtonContext = useTradeFormButtonContext('Limit order', { doTrade: handleTrade, confirmTrade })
+
+  if (!tradeFormButtonContext) return null
 
   // Display local form validation errors only when there are no primary errors
   if (!primaryFormValidation && localFormValidation) {
diff --git a/src/modules/tradeFormValidation/hooks/useTradeFormButtonContext.ts b/src/modules/tradeFormValidation/hooks/useTradeFormButtonContext.ts
new file mode 100644
index 0000000000..f39622e706
--- /dev/null
+++ b/src/modules/tradeFormValidation/hooks/useTradeFormButtonContext.ts
@@ -0,0 +1,42 @@
+import { useMemo } from 'react'
+
+import { useToggleWalletModal } from 'legacy/state/application/hooks'
+
+import { useWrapNativeFlow } from 'modules/trade'
+import { useDerivedTradeState } from 'modules/trade/hooks/useDerivedTradeState'
+import { useTradeQuote } from 'modules/tradeQuote'
+import { useWalletDetails } from 'modules/wallet'
+
+import { TradeFormButtonContext } from '../types'
+
+interface TradeFormCallbacks {
+  doTrade(): void
+  confirmTrade(): void
+}
+
+export function useTradeFormButtonContext(
+  defaultText: string,
+  callbacks: TradeFormCallbacks
+): TradeFormButtonContext | null {
+  const { state: derivedState } = useDerivedTradeState()
+  const wrapNativeFlow = useWrapNativeFlow()
+  const { isSupportedWallet } = useWalletDetails()
+  const quote = useTradeQuote()
+  const toggleWalletModal = useToggleWalletModal()
+
+  return useMemo(() => {
+    if (!derivedState) return null
+
+    return {
+      defaultText,
+      derivedState,
+      quote,
+      isSupportedWallet,
+      ...callbacks,
+      wrapNativeFlow,
+      connectWallet() {
+        toggleWalletModal()
+      },
+    }
+  }, [defaultText, derivedState, quote, isSupportedWallet, callbacks, wrapNativeFlow, toggleWalletModal])
+}
diff --git a/src/modules/tradeFormValidation/index.ts b/src/modules/tradeFormValidation/index.ts
index ecf9e5dbf6..c76df4d32a 100644
--- a/src/modules/tradeFormValidation/index.ts
+++ b/src/modules/tradeFormValidation/index.ts
@@ -1,5 +1,6 @@
 export * from './updaters/TradeFormValidationUpdater'
 export * from './hooks/useGetTradeFormValidation'
+export * from './hooks/useTradeFormButtonContext'
 export * from './pure/TradeFormButtons'
 export * from './pure/TradeFormBlankButton'
 export * from './types'
diff --git a/src/modules/twap/containers/ActionButtons/index.tsx b/src/modules/twap/containers/ActionButtons/index.tsx
new file mode 100644
index 0000000000..eedc179172
--- /dev/null
+++ b/src/modules/twap/containers/ActionButtons/index.tsx
@@ -0,0 +1,43 @@
+import React from 'react'
+
+import { useTradeConfirmActions } from 'modules/trade'
+import { TradeFormButtons, useGetTradeFormValidation } from 'modules/tradeFormValidation'
+import { useTradeFormButtonContext } from 'modules/tradeFormValidation'
+
+import { useSetupFallbackHandler } from '../../hooks/useSetupFallbackHandler'
+import { useTwapFormState } from '../../hooks/useTwapFormState'
+import { PrimaryActionButton } from '../../pure/PrimaryActionButton'
+
+export function ActionButtons() {
+  const setFallbackHandler = useSetupFallbackHandler()
+  const tradeConfirmActions = useTradeConfirmActions()
+  const localFormValidation = useTwapFormState()
+  const primaryFormValidation = useGetTradeFormValidation()
+
+  const primaryActionContext = {
+    setFallbackHandler,
+    openConfirmModal: tradeConfirmActions.onOpen,
+  }
+
+  const confirmTrade = tradeConfirmActions.onOpen
+
+  const tradeFormButtonContext = useTradeFormButtonContext('TWAP order', { doTrade: confirmTrade, confirmTrade })
+
+  if (!tradeFormButtonContext) return null
+
+  if (!primaryFormValidation && localFormValidation) {
+    return <PrimaryActionButton state={localFormValidation} context={primaryActionContext} />
+  }
+
+  return (
+    <TradeFormButtons
+      doTradeText="Place TWAP order"
+      confirmText="Review TWAP order"
+      validation={primaryFormValidation}
+      context={tradeFormButtonContext}
+      // TODO: bind isExpertMode to settings
+      isExpertMode={false}
+      isDisabled={false}
+    />
+  )
+}
diff --git a/src/modules/twap/containers/TwapFormWidget/index.tsx b/src/modules/twap/containers/TwapFormWidget/index.tsx
index 0376473097..e7d3837013 100644
--- a/src/modules/twap/containers/TwapFormWidget/index.tsx
+++ b/src/modules/twap/containers/TwapFormWidget/index.tsx
@@ -7,7 +7,6 @@ import {
   useAdvancedOrdersRawState,
   useUpdateAdvancedOrdersRawState,
 } from 'modules/advancedOrders'
-import { useTradeConfirmActions } from 'modules/trade'
 import { useIsWrapOrUnwrap } from 'modules/trade/hooks/useIsWrapOrUnwrap'
 import { TradeNumberInput } from 'modules/trade/pure/TradeNumberInput'
 import { TradeTextBox } from 'modules/trade/pure/TradeTextBox'
@@ -18,15 +17,13 @@ import { useRateInfoParams } from 'common/hooks/useRateInfoParams'
 import * as styledEl from './styled'
 
 import { DEFAULT_TWAP_SLIPPAGE, orderDeadlines, defaultNumOfParts } from '../../const'
-import { useSetupFallbackHandler } from '../../hooks/useSetupFallbackHandler'
-import { useTwapFormState } from '../../hooks/useTwapFormState'
 import { AmountParts } from '../../pure/AmountParts'
 import { DeadlineSelector } from '../../pure/DeadlineSelector'
-import { PrimaryActionButton } from '../../pure/PrimaryActionButton'
 import { partsStateAtom } from '../../state/partsStateAtom'
 import { twapTimeIntervalAtom } from '../../state/twapOrderAtom'
 import { twapOrdersSettingsAtom, updateTwapOrdersSettingsAtom } from '../../state/twapOrdersSettingsAtom'
 import { deadlinePartsDisplay } from '../../utils/deadlinePartsDisplay'
+import { ActionButtons } from '../ActionButtons'
 import { TwapConfirmModal } from '../TwapConfirmModal'
 
 export function TwapFormWidget() {
@@ -42,17 +39,8 @@ export function TwapFormWidget() {
   const updateSettingsState = useUpdateAtom(updateTwapOrdersSettingsAtom)
   const isWrapOrUnwrap = useIsWrapOrUnwrap()
 
-  const setFallbackHandler = useSetupFallbackHandler()
-  const tradeConfirmActions = useTradeConfirmActions()
-  const formState = useTwapFormState()
-
   const rateInfoParams = useRateInfoParams(inputCurrencyAmount, outputCurrencyAmount)
 
-  const primaryActionContext = {
-    setFallbackHandler,
-    openConfirmModal: tradeConfirmActions.onOpen,
-  }
-
   const deadlineState = {
     deadline,
     customDeadline,
@@ -112,7 +100,7 @@ export function TwapFormWidget() {
         </TradeTextBox>
       </styledEl.DeadlineRow>
 
-      <PrimaryActionButton state={formState} context={primaryActionContext} />
+      <ActionButtons />
     </>
   )
 }
diff --git a/src/modules/twap/hooks/useTwapFormState.ts b/src/modules/twap/hooks/useTwapFormState.ts
index 0fd0de07bd..32c7b2e0d3 100644
--- a/src/modules/twap/hooks/useTwapFormState.ts
+++ b/src/modules/twap/hooks/useTwapFormState.ts
@@ -10,7 +10,7 @@ import { getTwapFormState, TwapFormState } from '../pure/PrimaryActionButton/get
 import { verifyExtensibleFallback } from '../services/verifyExtensibleFallback'
 import { twapOrderAtom } from '../state/twapOrderAtom'
 
-export function useTwapFormState(): TwapFormState {
+export function useTwapFormState(): TwapFormState | null {
   const isSafeApp = useIsSafeApp()
   const extensibleFallbackContext = useExtensibleFallbackContext()
 
diff --git a/src/modules/twap/pure/PrimaryActionButton/getTwapFormState.tsx b/src/modules/twap/pure/PrimaryActionButton/getTwapFormState.tsx
index b218392c70..0e598b2546 100644
--- a/src/modules/twap/pure/PrimaryActionButton/getTwapFormState.tsx
+++ b/src/modules/twap/pure/PrimaryActionButton/getTwapFormState.tsx
@@ -7,27 +7,26 @@ export interface TwapFormStateParams {
   twapOrder: TWAPOrder | null
 }
 
-// TODO: compose with common TradeFormState
 export enum TwapFormState {
-  LOADING,
+  LOADING_SAFE_INFO,
   NOT_SAFE,
   ORDER_NOT_SPECIFIED, // TODO: reveal details
   NEED_FALLBACK_HANDLER,
   CAN_CREATE_ORDER,
 }
 
-export function getTwapFormState(props: TwapFormStateParams): TwapFormState {
+export function getTwapFormState(props: TwapFormStateParams): TwapFormState | null {
   const { isSafeApp, verification, twapOrder } = props
 
   if (!isSafeApp) return TwapFormState.NOT_SAFE
 
-  if (verification === null) return TwapFormState.LOADING
+  if (verification === null) return TwapFormState.LOADING_SAFE_INFO
 
   if (!twapOrder) return TwapFormState.ORDER_NOT_SPECIFIED
 
-  if (verification === ExtensibleFallbackVerification.HAS_DOMAIN_VERIFIER) {
-    return TwapFormState.CAN_CREATE_ORDER
+  if (verification !== ExtensibleFallbackVerification.HAS_DOMAIN_VERIFIER) {
+    return TwapFormState.NEED_FALLBACK_HANDLER
   }
 
-  return TwapFormState.NEED_FALLBACK_HANDLER
+  return null
 }
diff --git a/src/modules/twap/pure/PrimaryActionButton/index.tsx b/src/modules/twap/pure/PrimaryActionButton/index.tsx
index aaa03e4d88..d82a740e12 100644
--- a/src/modules/twap/pure/PrimaryActionButton/index.tsx
+++ b/src/modules/twap/pure/PrimaryActionButton/index.tsx
@@ -13,7 +13,7 @@ export interface PrimaryActionButtonContext {
 // TODO: extend with common trade widget states
 // TODO: set correct buttons text
 const buttonsMap: Record<TwapFormState, (context: PrimaryActionButtonContext) => JSX.Element> = {
-  [TwapFormState.LOADING]: () => (
+  [TwapFormState.LOADING_SAFE_INFO]: () => (
     <ButtonPrimary disabled={true} buttonSize={ButtonSize.BIG}>
       Loading...
     </ButtonPrimary>
diff --git a/src/pages/AdvancedOrders/index.tsx b/src/pages/AdvancedOrders/index.tsx
index f41721a83a..f948e744fa 100644
--- a/src/pages/AdvancedOrders/index.tsx
+++ b/src/pages/AdvancedOrders/index.tsx
@@ -1,10 +1,14 @@
 import { AdvancedOrdersWidget } from 'modules/advancedOrders'
 import { OrdersTableWidget } from 'modules/ordersTable'
 import * as styledEl from 'modules/trade/pure/TradePageLayout'
+import { TradeFormValidationUpdater } from 'modules/tradeFormValidation'
 
 export default function AdvancedOrdersPage() {
   return (
     <>
+      {/*TODO: add isExpertMode value*/}
+      <TradeFormValidationUpdater isExpertMode={false} />
+
       {/*TODO: add isUnlocked value*/}
       <styledEl.PageWrapper isUnlocked={true}>
         <styledEl.PrimaryWrapper>

From a6bb882be15edcb663dbb189c3306c1af4b0d851 Mon Sep 17 00:00:00 2001
From: shoom3301 <shoom3301@gmail.com>
Date: Tue, 6 Jun 2023 15:39:26 +0600
Subject: [PATCH 05/67] fix: fix kind field in useQuoteParams

---
 src/modules/tradeQuote/hooks/useQuoteParams.ts | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/modules/tradeQuote/hooks/useQuoteParams.ts b/src/modules/tradeQuote/hooks/useQuoteParams.ts
index 511dd85db8..ff634ef633 100644
--- a/src/modules/tradeQuote/hooks/useQuoteParams.ts
+++ b/src/modules/tradeQuote/hooks/useQuoteParams.ts
@@ -1,8 +1,6 @@
 import { useAtomValue } from 'jotai'
 import { useMemo } from 'react'
 
-import { OrderKind } from '@cowprotocol/cow-sdk'
-
 import { useDerivedTradeState } from 'modules/trade/hooks/useDerivedTradeState'
 import { useWalletInfo } from 'modules/wallet'
 
@@ -15,7 +13,7 @@ export function useQuoteParams() {
   const { state } = useDerivedTradeState()
   const { amount } = useAtomValue(tradeQuoteParamsAtom)
 
-  const { inputCurrency, outputCurrency } = state || {}
+  const { inputCurrency, outputCurrency, orderKind } = state || {}
 
   const amountStr = amount?.quotient.toString()
 
@@ -35,10 +33,10 @@ export function useQuoteParams() {
       amount: amountStr,
       chainId,
       receiver: account,
-      kind: OrderKind.SELL,
+      kind: orderKind,
       toDecimals,
       fromDecimals,
       isEthFlow: false,
     }
-  }, [inputCurrency, outputCurrency, amountStr, account, chainId])
+  }, [inputCurrency, outputCurrency, amountStr, account, chainId, orderKind])
 }

From 23b2a0db189585c66677a7573df5ee29fcd395f4 Mon Sep 17 00:00:00 2001
From: Alexandr Kazachenko <shoom3301@gmail.com>
Date: Tue, 6 Jun 2023 18:14:29 +0600
Subject: [PATCH 06/67] chore(develop): release 1.38.1 (#2606)

---
 CHANGELOG.md      | 2 +-
 public/index.html | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1a12077616..5fa077d3cf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## [1.39.0](https://github.com/cowprotocol/cowswap/compare/v1.38.0...v1.39.0) (2023-05-25)
+## [1.38.1](https://github.com/cowprotocol/cowswap/compare/v1.38.0...v1.38.1) (2023-05-25)
 
 
 ### Features
diff --git a/public/index.html b/public/index.html
index e3d19696f4..ab594caf4a 100644
--- a/public/index.html
+++ b/public/index.html
@@ -135,5 +135,4 @@
   <div id="root"></div>
 
 </body>
-
 </html>

From 67a15f0c25690ced61135518e30961e17fc1bcf7 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 6 Jun 2023 18:18:37 +0600
Subject: [PATCH 07/67] chore(develop): release 1.39.0 (#2607)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 CHANGELOG.md | 30 ++++++++++++++++++++++++++++++
 package.json |  2 +-
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5fa077d3cf..2a6788120f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,35 @@
 # Changelog
 
+## [1.39.0](https://github.com/cowprotocol/cowswap/compare/v1.38.1...v1.39.0) (2023-06-06)
+
+
+### Features
+
+* add rate info ([#2570](https://github.com/cowprotocol/cowswap/issues/2570)) ([52cfa63](https://github.com/cowprotocol/cowswap/commit/52cfa63c50e1fce0fdb476f7b4509b3774c6a185))
+* clickable fill+status label for order receipt ([#2559](https://github.com/cowprotocol/cowswap/issues/2559)) ([b56954e](https://github.com/cowprotocol/cowswap/commit/b56954e1b2d46a76ac5dac19f309a82523832bc9))
+* get quote for single part in TWAP ([#2580](https://github.com/cowprotocol/cowswap/issues/2580)) ([40b2627](https://github.com/cowprotocol/cowswap/commit/40b2627ce90ff789d77458ba924f4ff837247a30))
+* **limit-orders:** integrate TradeConfirmModal in Limit orders ([#2573](https://github.com/cowprotocol/cowswap/issues/2573)) ([dd76fc2](https://github.com/cowprotocol/cowswap/commit/dd76fc26b602a0b9d6b28bec4ab9a4bc505bdeb8))
+* **safe-eth-flow:** add Safe Eth flow ([#2576](https://github.com/cowprotocol/cowswap/issues/2576)) ([ec4426a](https://github.com/cowprotocol/cowswap/commit/ec4426abe8a1165beb99531f60603fdba3bb9421))
+* show Safe WC banner when selling ETH ([#2588](https://github.com/cowprotocol/cowswap/issues/2588)) ([8107248](https://github.com/cowprotocol/cowswap/commit/810724837298a69a9d110b455d9abf17e4176939))
+* **smart-contract-orders:** hide sc presign orders on start ([#2525](https://github.com/cowprotocol/cowswap/issues/2525)) ([96ea696](https://github.com/cowprotocol/cowswap/commit/96ea6960c91c6a0f9aaea2260399a450fcbf4f2b))
+* swap SELL and BUY fields ([#2567](https://github.com/cowprotocol/cowswap/issues/2567)) ([a9d243e](https://github.com/cowprotocol/cowswap/commit/a9d243e6fe623ebb708934955771f35f120cd952))
+* **trade-form-validation:** service to validate generic trade widget behaviour ([#2590](https://github.com/cowprotocol/cowswap/issues/2590)) ([9493f11](https://github.com/cowprotocol/cowswap/commit/9493f111f88ad8020013ba57afd9ee87ca52cb2a))
+* **trade:** move import token and approval modals to TradeWidget ([#2547](https://github.com/cowprotocol/cowswap/issues/2547)) ([3ce3316](https://github.com/cowprotocol/cowswap/commit/3ce3316c46adecc57c92eb4972dc5db68d0a2bd0))
+* **twap:** add generic trade form validation to TWAP ([#2592](https://github.com/cowprotocol/cowswap/issues/2592)) ([bccacb6](https://github.com/cowprotocol/cowswap/commit/bccacb60cb9e53c1935da727c0900a5e9f1c4cfc))
+* **twap:** add orders table to Advanced orders page ([8de717c](https://github.com/cowprotocol/cowswap/commit/8de717c188c7ba72872196817801c7b192c3bc46))
+* **twap:** integrate TradeConfirmModal in Twap orders ([#2574](https://github.com/cowprotocol/cowswap/issues/2574)) ([771da11](https://github.com/cowprotocol/cowswap/commit/771da1155953c31b94903061e0993de39068858b))
+* **twap:** order creation and fallback verification MVP ([#2533](https://github.com/cowprotocol/cowswap/issues/2533)) ([3dea3d4](https://github.com/cowprotocol/cowswap/commit/3dea3d4fb2da7ac97d4f14297c1b5ed8837b668c))
+
+
+### Bug Fixes
+
+* do not trigger expired NPS for hidden orders ([#2554](https://github.com/cowprotocol/cowswap/issues/2554)) ([e806902](https://github.com/cowprotocol/cowswap/commit/e806902bb78dc094a4f5d2a19383de787d5529db))
+* expired order that still shows as pending ([#2558](https://github.com/cowprotocol/cowswap/issues/2558)) ([645c242](https://github.com/cowprotocol/cowswap/commit/645c2426f44eca49abd7d36c47530e3de3af1d0c))
+* fix kind field in useQuoteParams ([a6bb882](https://github.com/cowprotocol/cowswap/commit/a6bb882be15edcb663dbb189c3306c1af4b0d851))
+* **limit-orders:** fix quoting for buy flow ([#2598](https://github.com/cowprotocol/cowswap/issues/2598)) ([76b927f](https://github.com/cowprotocol/cowswap/commit/76b927f4ac9a1a7a5609947123189a92071415b0))
+* make (Trust) wallet icon round on modals ([#2599](https://github.com/cowprotocol/cowswap/issues/2599)) ([dabf88e](https://github.com/cowprotocol/cowswap/commit/dabf88e1af67f872d36846e2e60902dcc7397f61))
+* unsupported token error fix ([d05ae0f](https://github.com/cowprotocol/cowswap/commit/d05ae0f5085685aaf07c78d2f42385522c0e051f))
+
 ## [1.38.1](https://github.com/cowprotocol/cowswap/compare/v1.38.0...v1.38.1) (2023-05-25)
 
 
diff --git a/package.json b/package.json
index 7adbb34934..6f2920d43a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cowprotocol/cowswap",
-  "version": "1.38.1",
+  "version": "1.39.0",
   "description": "CoW Swap",
   "main": "index.js",
   "author": "",

From 7e1e798c324ca658d153a49f04a3fa9a08d1a426 Mon Sep 17 00:00:00 2001
From: Alexandr Kazachenko <shoom3301@gmail.com>
Date: Thu, 8 Jun 2023 23:44:56 +0600
Subject: [PATCH 08/67] fix(twap): display local form validation first (#2626)

---
 src/modules/twap/containers/ActionButtons/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/twap/containers/ActionButtons/index.tsx b/src/modules/twap/containers/ActionButtons/index.tsx
index eedc179172..0de5f4376e 100644
--- a/src/modules/twap/containers/ActionButtons/index.tsx
+++ b/src/modules/twap/containers/ActionButtons/index.tsx
@@ -25,7 +25,7 @@ export function ActionButtons() {
 
   if (!tradeFormButtonContext) return null
 
-  if (!primaryFormValidation && localFormValidation) {
+  if (localFormValidation) {
     return <PrimaryActionButton state={localFormValidation} context={primaryActionContext} />
   }
 

From 15a688e7edecf76f80a7ef60f36a2813e38b7e2a Mon Sep 17 00:00:00 2001
From: Alexandr Kazachenko <shoom3301@gmail.com>
Date: Thu, 8 Jun 2023 23:45:50 +0600
Subject: [PATCH 09/67] feat(twap): persist twap orders from Safe and display
 them in orders table (#2597)

---
 package.json                                  |   1 +
 src/abis/ComposableCoW.json                   | 128 ++++++++++++++++++
 src/api/gnosisProtocol/api.ts                 |  13 +-
 src/api/gnosisProtocol/hooks.ts               |  76 ++++++++++-
 src/api/gnosisProtocol/index.ts               |   2 +-
 src/api/gnosisSafe/hooks/useSafeSdk.ts        |  29 ----
 src/cowSdk.ts                                 |   6 +-
 src/legacy/hooks/useRecentActivity.ts         |   2 +-
 src/legacy/state/orders/hooks.ts              |  33 +++--
 .../updaters/UnfillableOrdersUpdater.ts       |   2 +-
 src/legacy/utils/environments.ts              |   3 +-
 src/lib/state/index.ts                        |  13 --
 .../containers/AdvancedOrdersWidget/index.tsx |  10 +-
 .../tokensList/state/tokensListAtom.ts        |   8 +-
 .../tokensList/updaters/TokensListUpdater.ts  |   9 +-
 .../tradeQuote/hooks/useQuoteParams.ts        |   8 +-
 .../hooks/useSetTradeQuoteParams.ts           |   4 +-
 .../tradeQuote/state/tradeQuoteParamsAtom.ts  |   4 +-
 src/modules/twap/const.ts                     |   5 +
 .../twap/containers/TwapFormWidget/index.tsx  |  12 ++
 .../twap/hooks/useFetchTwapOrdersFromSafe.ts  |  38 ++++++
 .../twap/hooks/useFetchTwapPartOrders.ts      |  84 ++++++++++++
 .../twap/hooks/useTwapDiscreteOrders.ts       |  29 ++++
 .../twap/hooks/useTwapOrdersAuthMulticall.ts  |  33 +++++
 .../hooks/useTwapOrdersTradeableMulticall.ts  |  40 ++++++
 .../twap/services/fetchTwapOrdersFromSafe.ts  |  67 +++++++++
 src/modules/twap/state/twapOrdersListAtom.ts  |  35 +++++
 src/modules/twap/state/twapPartOrdersAtom.ts  |  40 ++++++
 src/modules/twap/types.ts                     |  38 ++++++
 .../twap/updaters/TwapOrdersUpdater.tsx       |  80 +++++++++++
 .../twap/utils/buildTwapOrdersItems.ts        |  47 +++++++
 src/modules/twap/utils/emulateTwapAsOrder.ts  |  51 +++++++
 .../twap/utils/getConditionalOrderId.ts       |  10 ++
 src/modules/twap/utils/getTwapOrderStatus.ts  |  28 ++++
 .../twap/utils/parseTwapOrderStruct.ts        |  32 +++++
 src/pages/AdvancedOrders/index.tsx            |   6 +-
 src/utils/orderUtils/computeOrderUid.ts       |   9 ++
 37 files changed, 942 insertions(+), 93 deletions(-)
 delete mode 100644 src/api/gnosisSafe/hooks/useSafeSdk.ts
 delete mode 100644 src/lib/state/index.ts
 create mode 100644 src/modules/twap/hooks/useFetchTwapOrdersFromSafe.ts
 create mode 100644 src/modules/twap/hooks/useFetchTwapPartOrders.ts
 create mode 100644 src/modules/twap/hooks/useTwapDiscreteOrders.ts
 create mode 100644 src/modules/twap/hooks/useTwapOrdersAuthMulticall.ts
 create mode 100644 src/modules/twap/hooks/useTwapOrdersTradeableMulticall.ts
 create mode 100644 src/modules/twap/services/fetchTwapOrdersFromSafe.ts
 create mode 100644 src/modules/twap/state/twapOrdersListAtom.ts
 create mode 100644 src/modules/twap/state/twapPartOrdersAtom.ts
 create mode 100644 src/modules/twap/updaters/TwapOrdersUpdater.tsx
 create mode 100644 src/modules/twap/utils/buildTwapOrdersItems.ts
 create mode 100644 src/modules/twap/utils/emulateTwapAsOrder.ts
 create mode 100644 src/modules/twap/utils/getConditionalOrderId.ts
 create mode 100644 src/modules/twap/utils/getTwapOrderStatus.ts
 create mode 100644 src/modules/twap/utils/parseTwapOrderStruct.ts
 create mode 100644 src/utils/orderUtils/computeOrderUid.ts

diff --git a/package.json b/package.json
index 8e4483f646..f115069b3a 100644
--- a/package.json
+++ b/package.json
@@ -134,6 +134,7 @@
     "date-fns": "^2.29.3",
     "ethers": "^5.1.4",
     "exponential-backoff": "^3.1.1",
+    "fast-deep-equal": "^3.1.3",
     "fast-safe-stringify": "^2.0.8",
     "fortmatic": "^2.2.1",
     "fraction.js": "^4.2.0",
diff --git a/src/abis/ComposableCoW.json b/src/abis/ComposableCoW.json
index bc5cfed9ef..f86d84a355 100644
--- a/src/abis/ComposableCoW.json
+++ b/src/abis/ComposableCoW.json
@@ -33,5 +33,133 @@
     "outputs": [],
     "stateMutability": "nonpayable",
     "type": "function"
+  },
+  {
+    "inputs": [
+      { "name": "safe", "type": "address" },
+      { "name": "singleOrderHash", "type": "bytes32" }
+    ],
+    "name": "singleOrders",
+    "outputs": [{ "name": "", "type": "bool" }],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "owner",
+        "type": "address"
+      },
+      {
+        "components": [
+          {
+            "internalType": "contract IConditionalOrder",
+            "name": "handler",
+            "type": "address"
+          },
+          {
+            "internalType": "bytes32",
+            "name": "salt",
+            "type": "bytes32"
+          },
+          {
+            "internalType": "bytes",
+            "name": "staticInput",
+            "type": "bytes"
+          }
+        ],
+        "internalType": "struct IConditionalOrder.ConditionalOrderParams",
+        "name": "params",
+        "type": "tuple"
+      },
+      {
+        "internalType": "bytes",
+        "name": "offchainInput",
+        "type": "bytes"
+      },
+      {
+        "internalType": "bytes32[]",
+        "name": "proof",
+        "type": "bytes32[]"
+      }
+    ],
+    "name": "getTradeableOrderWithSignature",
+    "outputs": [
+      {
+        "components": [
+          {
+            "internalType": "contract IERC20",
+            "name": "sellToken",
+            "type": "address"
+          },
+          {
+            "internalType": "contract IERC20",
+            "name": "buyToken",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "receiver",
+            "type": "address"
+          },
+          {
+            "internalType": "uint256",
+            "name": "sellAmount",
+            "type": "uint256"
+          },
+          {
+            "internalType": "uint256",
+            "name": "buyAmount",
+            "type": "uint256"
+          },
+          {
+            "internalType": "uint32",
+            "name": "validTo",
+            "type": "uint32"
+          },
+          {
+            "internalType": "bytes32",
+            "name": "appData",
+            "type": "bytes32"
+          },
+          {
+            "internalType": "uint256",
+            "name": "feeAmount",
+            "type": "uint256"
+          },
+          {
+            "internalType": "bytes32",
+            "name": "kind",
+            "type": "bytes32"
+          },
+          {
+            "internalType": "bool",
+            "name": "partiallyFillable",
+            "type": "bool"
+          },
+          {
+            "internalType": "bytes32",
+            "name": "sellTokenBalance",
+            "type": "bytes32"
+          },
+          {
+            "internalType": "bytes32",
+            "name": "buyTokenBalance",
+            "type": "bytes32"
+          }
+        ],
+        "internalType": "struct GPv2Order.Data",
+        "name": "order",
+        "type": "tuple"
+      },
+      {
+        "internalType": "bytes",
+        "name": "signature",
+        "type": "bytes"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
   }
 ]
diff --git a/src/api/gnosisProtocol/api.ts b/src/api/gnosisProtocol/api.ts
index 39be5cfa01..cbc2e2f204 100644
--- a/src/api/gnosisProtocol/api.ts
+++ b/src/api/gnosisProtocol/api.ts
@@ -1,7 +1,7 @@
 import { OrderBookApiError, PriceQuality, SupportedChainId as ChainId } from '@cowprotocol/cow-sdk'
 import { OrderKind } from '@cowprotocol/cow-sdk'
 import { OrderQuoteRequest, SigningScheme, OrderQuoteResponse, EnrichedOrder } from '@cowprotocol/cow-sdk'
-import { NativePriceResponse, Trade } from '@cowprotocol/cow-sdk'
+import { NativePriceResponse, Trade, PartialApiContext, Address } from '@cowprotocol/cow-sdk'
 
 import { orderBookApi } from 'cowSdk'
 
@@ -144,8 +144,15 @@ export async function getOrder(chainId: ChainId, orderId: string): Promise<Enric
   return orderBookApi.getOrder(orderId, { chainId })
 }
 
-export async function getOrders(chainId: ChainId, owner: string, limit = 1000, offset = 0): Promise<EnrichedOrder[]> {
-  return orderBookApi.getOrders({ owner, limit, offset }, { chainId })
+export async function getOrders(
+  params: {
+    owner: Address
+    offset?: number
+    limit?: number
+  },
+  context: PartialApiContext
+): Promise<EnrichedOrder[]> {
+  return orderBookApi.getOrders(params, context)
 }
 
 export async function getTrades(chainId: ChainId, owner: string): Promise<Trade[]> {
diff --git a/src/api/gnosisProtocol/hooks.ts b/src/api/gnosisProtocol/hooks.ts
index 4a843b9129..08c2aa50f8 100644
--- a/src/api/gnosisProtocol/hooks.ts
+++ b/src/api/gnosisProtocol/hooks.ts
@@ -1,25 +1,89 @@
+import { useAtomValue } from 'jotai'
+import { useMemo } from 'react'
+
 import { EnrichedOrder } from '@cowprotocol/cow-sdk'
 
 import useSWR from 'swr'
 
 import { AMOUNT_OF_ORDERS_TO_FETCH } from 'legacy/constants'
+import { isBarnBackendEnv } from 'legacy/utils/environments'
 import { supportedChainId } from 'legacy/utils/supportedChainId'
 
+import { emulatedTwapOrdersAtom } from 'modules/twap/state/twapOrdersListAtom'
+import { TwapPartOrderItem, twapPartOrdersListAtom } from 'modules/twap/state/twapPartOrdersAtom'
 import { useWalletInfo } from 'modules/wallet'
 
-import { getOrders } from 'api/gnosisProtocol'
+import { getOrders } from './api'
 
-export function useGpOrders(account?: string | null, refreshInterval?: number): EnrichedOrder[] | undefined {
+/**
+ * TODO: refactor this hook
+ * Currently there is a problem with Dependency inversion principle
+ * This hook depends on 'modules/twap', but it must not
+ *
+ * This violation is added because of environment restrictions for TWAP
+ * Currently, WatchTower creates discrete orders only on PROD environment
+ * And even if you created a TWAP order not in PROD, we have to load discrete orders from PROD order-book
+ *
+ * For non-PROD environment we do two requests: barn and prod
+ * For PROD environment we do only one: prod. It depends on isBarnBackendEnv
+ */
+export function useGpOrders(account?: string | null, refreshInterval?: number): EnrichedOrder[] {
   const { chainId: _chainId } = useWalletInfo()
   const chainId = supportedChainId(_chainId)
+  const emulatedTwapOrders = useAtomValue(emulatedTwapOrdersAtom)
+  const twapParticleOrders = useAtomValue(twapPartOrdersListAtom)
+
+  const requestParams = useMemo(() => {
+    return account ? { owner: account, limit: AMOUNT_OF_ORDERS_TO_FETCH } : null
+  }, [account])
+
+  // Fetch orders for the current environment
+  const { data: currentEnvOrders } = useSWR<EnrichedOrder[]>(
+    ['orders', requestParams, chainId],
+    () => {
+      if (!chainId || !requestParams) return []
+
+      return getOrders(requestParams, { chainId })
+    },
+    { refreshInterval }
+  )
 
-  const { data } = useSWR<EnrichedOrder[]>(
-    ['orders', account, chainId],
-    () => (chainId && account ? getOrders(chainId, account, AMOUNT_OF_ORDERS_TO_FETCH) : []),
+  // Fetch PROD orders only when current env is not prod
+  // We need them for TWAP
+  const { data: loadedProdOrders } = useSWR<EnrichedOrder[]>(
+    ['prod-orders', requestParams, chainId],
+    () => {
+      if (!chainId || !requestParams) return []
+      if (!isBarnBackendEnv) return []
+
+      return getOrders(requestParams, { chainId, env: 'prod' })
+    },
     { refreshInterval }
   )
 
-  return data
+  const prodOrders = useMemo(() => {
+    return isBarnBackendEnv ? loadedProdOrders : currentEnvOrders
+  }, [currentEnvOrders, loadedProdOrders])
+
+  // Take only orders are connected to TWAP orders
+  const twapRelatedOrders = useMemo(() => {
+    if (!prodOrders) return []
+
+    const particleOrdersMap = twapParticleOrders.reduce<{ [uid: string]: TwapPartOrderItem }>((acc, val) => {
+      acc[val.uid] = val
+
+      return acc
+    }, {})
+
+    return prodOrders.filter((order) => {
+      return particleOrdersMap[order.uid]
+    })
+  }, [twapParticleOrders, prodOrders])
+
+  // Add only TWAP-related orders to the common list of orders
+  return useMemo(() => {
+    return [...(currentEnvOrders || []), ...emulatedTwapOrders, ...twapRelatedOrders]
+  }, [currentEnvOrders, emulatedTwapOrders, twapRelatedOrders])
 }
 
 export function useHasOrders(account?: string | null): boolean | undefined {
diff --git a/src/api/gnosisProtocol/index.ts b/src/api/gnosisProtocol/index.ts
index b42bcaeab9..ede6377c72 100644
--- a/src/api/gnosisProtocol/index.ts
+++ b/src/api/gnosisProtocol/index.ts
@@ -14,8 +14,8 @@ export const {
   getProfileData,
   getQuote = realApi.getQuote,
   getOrder = realApi.getOrder,
-  getOrders = realApi.getOrders,
   getNativePrice = realApi.getNativePrice,
   getTrades = realApi.getTrades,
+  getOrders = realApi.getOrders,
   // functions that only have a mock
 } = useMock ? { ...mockApi } : { ...realApi }
diff --git a/src/api/gnosisSafe/hooks/useSafeSdk.ts b/src/api/gnosisSafe/hooks/useSafeSdk.ts
deleted file mode 100644
index 34fb17b264..0000000000
--- a/src/api/gnosisSafe/hooks/useSafeSdk.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { useEffect, useState } from 'react'
-
-import Safe from '@safe-global/protocol-kit'
-import { useWeb3React } from '@web3-react/core'
-
-import { useIsSafeWallet, useWalletInfo } from 'modules/wallet'
-
-import { createSafeSdkInstance } from 'api/gnosisSafe'
-
-export function useSafeSdk(): Safe | null {
-  const [safeSdk, setSafeSdk] = useState<Safe | null>(null)
-  const { account } = useWalletInfo()
-  const isSafeWallet = useIsSafeWallet()
-  const { provider } = useWeb3React()
-
-  useEffect(() => {
-    async function getInstance(): Promise<void> {
-      if (isSafeWallet && provider && account) {
-        setSafeSdk(await createSafeSdkInstance(account, provider))
-      } else {
-        setSafeSdk(null)
-      }
-    }
-
-    getInstance()
-  }, [account, isSafeWallet, provider])
-
-  return safeSdk
-}
diff --git a/src/cowSdk.ts b/src/cowSdk.ts
index d4df082a14..4ae4b4c415 100644
--- a/src/cowSdk.ts
+++ b/src/cowSdk.ts
@@ -1,7 +1,9 @@
 import { MetadataApi } from '@cowprotocol/app-data'
 import { OrderBookApi } from '@cowprotocol/cow-sdk'
 
-import { isBarn, isDev, isLocal, isPr } from 'legacy/utils/environments'
+import { isBarnBackendEnv } from 'legacy/utils/environments'
 
 export const metadataApiSDK = new MetadataApi()
-export const orderBookApi = new OrderBookApi({ env: isLocal || isDev || isPr || isBarn ? 'staging' : 'prod' })
+export const orderBookApi = new OrderBookApi({
+  env: isBarnBackendEnv ? 'staging' : 'prod',
+})
diff --git a/src/legacy/hooks/useRecentActivity.ts b/src/legacy/hooks/useRecentActivity.ts
index 5a3b9699d8..d4364d8bfd 100644
--- a/src/legacy/hooks/useRecentActivity.ts
+++ b/src/legacy/hooks/useRecentActivity.ts
@@ -230,7 +230,7 @@ export function useMultipleActivityDescriptors({ chainId, ids }: UseActivityDesc
     if (!chainId) return []
 
     return ids.reduce<ActivityDescriptors[]>((acc, id) => {
-      const activity = createActivityDescriptor(txs[id], orders[id])
+      const activity = createActivityDescriptor(txs[id], orders?.[id])
       if (activity) {
         acc.push(activity)
       }
diff --git a/src/legacy/state/orders/hooks.ts b/src/legacy/state/orders/hooks.ts
index bb3e0d7861..3f48035839 100644
--- a/src/legacy/state/orders/hooks.ts
+++ b/src/legacy/state/orders/hooks.ts
@@ -1,6 +1,6 @@
 import { useCallback, useMemo } from 'react'
 
-import { SupportedChainId as ChainId } from '@cowprotocol/cow-sdk'
+import { SupportedChainId } from '@cowprotocol/cow-sdk'
 
 import { useDispatch, useSelector } from 'react-redux'
 
@@ -58,11 +58,11 @@ interface AddPendingOrderParams extends GetRemoveOrderParams {
 
 interface GetRemoveOrderParams {
   id: OrderID
-  chainId: ChainId
+  chainId: SupportedChainId
 }
 type GetOrdersByIdParams = {
   ids: OrderID[]
-  chainId?: ChainId
+  chainId?: SupportedChainId
 }
 
 type GetOrdersParams = Partial<Pick<GetRemoveOrderParams, 'chainId'>>
@@ -71,7 +71,7 @@ type SetOrderCancellationHashParams = CancelOrderParams & { hash: string }
 
 interface UpdateOrdersBatchParams {
   ids: OrderID[]
-  chainId: ChainId
+  chainId: SupportedChainId
 }
 
 type ExpireOrdersBatchParams = UpdateOrdersBatchParams
@@ -155,14 +155,21 @@ export const useOrder = ({ id, chainId }: Partial<GetRemoveOrderParams>): Order
   })
 }
 
-function useOrdersStateNetwork(chainId: ChainId | undefined): OrdersStateNetwork | undefined {
-  return useSelector<AppState, OrdersState[ChainId] | undefined>((state) => {
+function useOrdersStateNetwork(chainId: SupportedChainId | undefined): OrdersStateNetwork | undefined {
+  const ordersState = useSelector<AppState, OrdersState[SupportedChainId] | undefined>((state) => {
     if (!chainId) {
       return undefined
     }
-    const ordersState = state.orders?.[chainId] || {}
-    return { ...getDefaultNetworkState(chainId), ...ordersState }
+    return state.orders?.[chainId]
   })
+
+  // Additional memoization to avoid excessive re-renders
+  // ordersState is a plain object that contains serialized data, so we can stringify it safely
+  return useMemo(() => {
+    if (!chainId) return undefined
+    return { ...getDefaultNetworkState(chainId), ...(ordersState || {}) }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [JSON.stringify(ordersState), chainId])
 }
 
 export const useOrders = ({ chainId }: GetOrdersParams): Order[] => {
@@ -193,16 +200,16 @@ export const useAllOrders = ({ chainId }: GetOrdersParams): PartialOrdersMap =>
   }, [state])
 }
 
-type OrdersMap = {
+export type OrdersMap = {
   [id: string]: Order
 }
 
-export const useOrdersById = ({ chainId, ids }: GetOrdersByIdParams): OrdersMap => {
+export const useOrdersById = ({ chainId, ids }: GetOrdersByIdParams): OrdersMap | null => {
   const allOrders = useAllOrders({ chainId })
 
   return useMemo(() => {
     if (!allOrders || !ids) {
-      return {}
+      return null
     }
 
     return ids.reduce<OrdersMap>((acc, id) => {
@@ -256,7 +263,7 @@ export const useCombinedPendingOrders = ({ chainId }: GetOrdersParams): Order[]
  * while usePendingOrders aggregates all pending states
  * @param chainId
  */
-export const useOnlyPendingOrders = ({ chainId }: GetOrdersParams): Order[] => {
+export const useOnlyPendingOrders = (chainId: SupportedChainId | undefined): Order[] => {
   const state = useSelector<AppState, PartialOrdersMap | undefined>(
     (state) => chainId && state.orders?.[chainId]?.pending
   )
@@ -329,7 +336,7 @@ export const useAddPendingOrder = (): AddOrderCallback => {
 }
 
 export type UpdateOrderParams = {
-  chainId: ChainId
+  chainId: SupportedChainId
   order: Partial<Omit<Order, 'id'>> & Pick<Order, 'id'>
 }
 
diff --git a/src/legacy/state/orders/updaters/UnfillableOrdersUpdater.ts b/src/legacy/state/orders/updaters/UnfillableOrdersUpdater.ts
index 9ae101a335..aa708bb168 100644
--- a/src/legacy/state/orders/updaters/UnfillableOrdersUpdater.ts
+++ b/src/legacy/state/orders/updaters/UnfillableOrdersUpdater.ts
@@ -93,7 +93,7 @@ export function UnfillableOrdersUpdater(): null {
   const updatePendingOrderPrices = useUpdateAtom(updatePendingOrderPricesAtom)
   const isWindowVisible = useIsWindowVisible()
 
-  const pending = useOnlyPendingOrders({ chainId })
+  const pending = useOnlyPendingOrders(chainId)
   const setIsOrderUnfillable = useSetIsOrderUnfillable()
   const strategy = useGetGpPriceStrategy()
 
diff --git a/src/legacy/utils/environments.ts b/src/legacy/utils/environments.ts
index 9ef471e3a2..06b58edcc1 100644
--- a/src/legacy/utils/environments.ts
+++ b/src/legacy/utils/environments.ts
@@ -66,7 +66,8 @@ export const environmentName = (function () {
 })()
 
 const isProdLike = isProd || isEns || isStaging || isBarn
+const isBarnBackendEnv = isLocal || isDev || isPr || isBarn
 
 registerOnWindow({ environment: environmentName })
 
-export { isLocal, isDev, isPr, isBarn, isStaging, isProd, isEns, isProdLike }
+export { isLocal, isDev, isPr, isBarn, isStaging, isProd, isEns, isProdLike, isBarnBackendEnv }
diff --git a/src/lib/state/index.ts b/src/lib/state/index.ts
deleted file mode 100644
index 057282bda3..0000000000
--- a/src/lib/state/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { createMulticall } from '@uniswap/redux-multicall'
-
-import { combineReducers, createStore } from 'redux'
-
-import price from 'legacy/state/price/reducer' // MOD
-
-export * from 'lib/state/multicall'
-
-const multicall = createMulticall()
-const reducer = combineReducers({ [multicall.reducerPath]: multicall.reducer, price })
-export const store = createStore(reducer)
-
-export default store
diff --git a/src/modules/advancedOrders/containers/AdvancedOrdersWidget/index.tsx b/src/modules/advancedOrders/containers/AdvancedOrdersWidget/index.tsx
index ae4af32d5c..fd62f8456e 100644
--- a/src/modules/advancedOrders/containers/AdvancedOrdersWidget/index.tsx
+++ b/src/modules/advancedOrders/containers/AdvancedOrdersWidget/index.tsx
@@ -11,12 +11,11 @@ import {
 } from 'modules/advancedOrders/hooks/useAdvancedOrdersDerivedState'
 import { useSetupTradeState, TradeWidget, TradeWidgetSlots } from 'modules/trade'
 import { useTradeQuote, useSetTradeQuoteParams } from 'modules/tradeQuote'
-import { TwapFormWidget } from 'modules/twap'
 import { partsStateAtom } from 'modules/twap/state/partsStateAtom'
 
 import { CurrencyInfo } from 'common/pure/CurrencyInputPanel/types'
 
-export function AdvancedOrdersWidget() {
+export function AdvancedOrdersWidget({ children }: { children: JSX.Element }) {
   useSetupTradeState()
   useFillAdvancedOrdersDerivedState()
 
@@ -60,12 +59,7 @@ export function AdvancedOrdersWidget() {
   // TODO
   const slots: TradeWidgetSlots = {
     settingsWidget: <div></div>,
-    bottomContent: (
-      <>
-        {/*TODO: conditionally display a widget for current advanced order type*/}
-        <TwapFormWidget />
-      </>
-    ),
+    bottomContent: children,
   }
 
   const params = {
diff --git a/src/modules/tokensList/state/tokensListAtom.ts b/src/modules/tokensList/state/tokensListAtom.ts
index 239fc331d4..0abca1bf79 100644
--- a/src/modules/tokensList/state/tokensListAtom.ts
+++ b/src/modules/tokensList/state/tokensListAtom.ts
@@ -17,5 +17,9 @@ export class TokenWithLogo extends Token {
   }
 }
 
-export const tokensByAddressAtom = atom<{ [address: string]: TokenWithLogo }>({})
-export const tokensBySymbolAtom = atom<{ [symbol: string]: TokenWithLogo[] }>({})
+export type TokensByAddress = { [address: string]: TokenWithLogo }
+
+export type TokensBySymbol = { [address: string]: TokenWithLogo[] }
+
+export const tokensByAddressAtom = atom<TokensByAddress>({})
+export const tokensBySymbolAtom = atom<TokensBySymbol>({})
diff --git a/src/modules/tokensList/updaters/TokensListUpdater.ts b/src/modules/tokensList/updaters/TokensListUpdater.ts
index 86f0145351..116fd1f563 100644
--- a/src/modules/tokensList/updaters/TokensListUpdater.ts
+++ b/src/modules/tokensList/updaters/TokensListUpdater.ts
@@ -1,5 +1,5 @@
 import { useUpdateAtom } from 'jotai/utils'
-import { useEffect } from 'react'
+import { useEffect, useMemo } from 'react'
 
 import { useTokensListWithDefaults } from 'legacy/state/lists/hooks'
 
@@ -14,11 +14,14 @@ export function TokensListUpdater() {
   const updateTokensByAddress = useUpdateAtom(tokensByAddressAtom)
   const updateTokensBySymbol = useUpdateAtom(tokensBySymbolAtom)
 
+  // eslint-disable-next-line react-hooks/exhaustive-deps
+  const allTokensMemo = useMemo(() => allTokens, [JSON.stringify(allTokens)])
+
   useEffect(() => {
     const tokensByAddressMap: { [address: string]: TokenWithLogo } = {}
     const tokensBySymbolMap: { [address: string]: TokenWithLogo[] } = {}
 
-    allTokens.forEach((token) => {
+    allTokensMemo.forEach((token) => {
       const wrappedToken: TokenWithLogo = new TokenWithLogo(
         token.logoURI,
         token.chainId,
@@ -46,7 +49,7 @@ export function TokensListUpdater() {
 
     updateTokensByAddress(tokensByAddressMap)
     updateTokensBySymbol(tokensBySymbolMap)
-  }, [allTokens, updateTokensByAddress, updateTokensBySymbol])
+  }, [allTokensMemo, updateTokensByAddress, updateTokensBySymbol])
 
   return null
 }
diff --git a/src/modules/tradeQuote/hooks/useQuoteParams.ts b/src/modules/tradeQuote/hooks/useQuoteParams.ts
index 7ceadcdfb8..20558e7733 100644
--- a/src/modules/tradeQuote/hooks/useQuoteParams.ts
+++ b/src/modules/tradeQuote/hooks/useQuoteParams.ts
@@ -17,10 +17,8 @@ export function useQuoteParams() {
 
   const { inputCurrency, outputCurrency, orderKind } = state || {}
 
-  const amountStr = amount?.quotient.toString()
-
   return useMemo(() => {
-    if (!inputCurrency || !outputCurrency || !amountStr) {
+    if (!inputCurrency || !outputCurrency || !amount) {
       return
     }
 
@@ -32,7 +30,7 @@ export function useQuoteParams() {
     return {
       sellToken,
       buyToken,
-      amount: amountStr,
+      amount,
       chainId,
       receiver: account,
       kind: orderKind,
@@ -40,5 +38,5 @@ export function useQuoteParams() {
       fromDecimals,
       isEthFlow: false,
     }
-  }, [inputCurrency, outputCurrency, amountStr, account, chainId, orderKind])
+  }, [inputCurrency, outputCurrency, amount, account, chainId, orderKind])
 }
diff --git a/src/modules/tradeQuote/hooks/useSetTradeQuoteParams.ts b/src/modules/tradeQuote/hooks/useSetTradeQuoteParams.ts
index 9119b824e7..d5a912b4df 100644
--- a/src/modules/tradeQuote/hooks/useSetTradeQuoteParams.ts
+++ b/src/modules/tradeQuote/hooks/useSetTradeQuoteParams.ts
@@ -6,10 +6,12 @@ import { Currency, CurrencyAmount } from '@uniswap/sdk-core'
 import { updateTradeQuoteAtom } from '../state/tradeQuoteAtom'
 import { tradeQuoteParamsAtom } from '../state/tradeQuoteParamsAtom'
 
-export function useSetTradeQuoteParams(amount: CurrencyAmount<Currency> | null) {
+export function useSetTradeQuoteParams(currencyAmount: CurrencyAmount<Currency> | null) {
   const updateTradeQuote = useUpdateAtom(updateTradeQuoteAtom)
   const updateState = useUpdateAtom(tradeQuoteParamsAtom)
 
+  const amount = currencyAmount?.quotient.toString() || null
+
   useEffect(() => {
     updateTradeQuote({ response: null, error: null })
     updateState({ amount })
diff --git a/src/modules/tradeQuote/state/tradeQuoteParamsAtom.ts b/src/modules/tradeQuote/state/tradeQuoteParamsAtom.ts
index dd5e54de55..f525dcba77 100644
--- a/src/modules/tradeQuote/state/tradeQuoteParamsAtom.ts
+++ b/src/modules/tradeQuote/state/tradeQuoteParamsAtom.ts
@@ -1,9 +1,7 @@
 import { atom } from 'jotai'
 
-import { Currency, CurrencyAmount } from '@uniswap/sdk-core'
-
 export interface TradeQuoteParamsState {
-  amount: CurrencyAmount<Currency> | null
+  amount: string | null
 }
 
 export const tradeQuoteParamsAtom = atom<TradeQuoteParamsState>({ amount: null })
diff --git a/src/modules/twap/const.ts b/src/modules/twap/const.ts
index be41985a35..2285da8fb5 100644
--- a/src/modules/twap/const.ts
+++ b/src/modules/twap/const.ts
@@ -3,6 +3,8 @@ import { Percent } from '@uniswap/sdk-core'
 
 import ms from 'ms.macro'
 
+import { TwapOrderStatus } from './types'
+
 export const DEFAULT_TWAP_SLIPPAGE = new Percent(10, 100) // 10%
 
 export type OrderDeadline = { label: string; value: number }
@@ -29,3 +31,6 @@ export const TWAP_HANDLER_ADDRESS: Record<SupportedChainId, string> = {
   100: 'TODO',
   5: '0xa12d770028d7072b80baeb6a1df962374fd13d9a',
 }
+
+// TODO: Add filled status
+export const TWAP_NOT_PENDING_STATUSES = [TwapOrderStatus.Cancelled, TwapOrderStatus.Expired]
diff --git a/src/modules/twap/containers/TwapFormWidget/index.tsx b/src/modules/twap/containers/TwapFormWidget/index.tsx
index e7d3837013..617a974a15 100644
--- a/src/modules/twap/containers/TwapFormWidget/index.tsx
+++ b/src/modules/twap/containers/TwapFormWidget/index.tsx
@@ -7,10 +7,12 @@ import {
   useAdvancedOrdersRawState,
   useUpdateAdvancedOrdersRawState,
 } from 'modules/advancedOrders'
+import { useComposableCowContract } from 'modules/advancedOrders/hooks/useComposableCowContract'
 import { useIsWrapOrUnwrap } from 'modules/trade/hooks/useIsWrapOrUnwrap'
 import { TradeNumberInput } from 'modules/trade/pure/TradeNumberInput'
 import { TradeTextBox } from 'modules/trade/pure/TradeTextBox'
 import { QuoteObserverUpdater } from 'modules/twap/updaters/QuoteObserverUpdater'
+import { useIsSafeApp, useWalletInfo } from 'modules/wallet'
 
 import { useRateInfoParams } from 'common/hooks/useRateInfoParams'
 
@@ -22,11 +24,14 @@ import { DeadlineSelector } from '../../pure/DeadlineSelector'
 import { partsStateAtom } from '../../state/partsStateAtom'
 import { twapTimeIntervalAtom } from '../../state/twapOrderAtom'
 import { twapOrdersSettingsAtom, updateTwapOrdersSettingsAtom } from '../../state/twapOrdersSettingsAtom'
+import { TwapOrdersUpdater } from '../../updaters/TwapOrdersUpdater'
 import { deadlinePartsDisplay } from '../../utils/deadlinePartsDisplay'
 import { ActionButtons } from '../ActionButtons'
 import { TwapConfirmModal } from '../TwapConfirmModal'
 
 export function TwapFormWidget() {
+  const { chainId, account } = useWalletInfo()
+  const isSafeApp = useIsSafeApp()
   const { numberOfPartsValue, slippageValue, deadline, customDeadline, isCustomDeadline } =
     useAtomValue(twapOrdersSettingsAtom)
 
@@ -39,6 +44,8 @@ export function TwapFormWidget() {
   const updateSettingsState = useUpdateAtom(updateTwapOrdersSettingsAtom)
   const isWrapOrUnwrap = useIsWrapOrUnwrap()
 
+  const composableCowContract = useComposableCowContract()
+
   const rateInfoParams = useRateInfoParams(inputCurrencyAmount, outputCurrencyAmount)
 
   const deadlineState = {
@@ -47,6 +54,8 @@ export function TwapFormWidget() {
     isCustomDeadline,
   }
 
+  const shouldLoadTwapOrders = !!(isSafeApp && chainId && account && composableCowContract)
+
   // Reset output amount when num of parts or input amount are changed
   useEffect(() => {
     updateRawState({ outputCurrencyAmount: null })
@@ -55,6 +64,9 @@ export function TwapFormWidget() {
   return (
     <>
       <QuoteObserverUpdater />
+      {shouldLoadTwapOrders && (
+        <TwapOrdersUpdater composableCowContract={composableCowContract} safeAddress={account} chainId={chainId} />
+      )}
       <TwapConfirmModal />
 
       {!isWrapOrUnwrap && (
diff --git a/src/modules/twap/hooks/useFetchTwapOrdersFromSafe.ts b/src/modules/twap/hooks/useFetchTwapOrdersFromSafe.ts
new file mode 100644
index 0000000000..b2f18b34aa
--- /dev/null
+++ b/src/modules/twap/hooks/useFetchTwapOrdersFromSafe.ts
@@ -0,0 +1,38 @@
+import { useEffect, useState } from 'react'
+
+import ms from 'ms.macro'
+
+import { ComposableCoW } from 'abis/types'
+import { useSafeApiKit } from 'api/gnosisSafe/hooks/useSafeApiKit'
+
+import { fetchTwapOrdersFromSafe, TwapOrdersSafeData } from '../services/fetchTwapOrdersFromSafe'
+
+const PENDING_TWAP_UPDATE_INTERVAL = ms`10s`
+
+export function useFetchTwapOrdersFromSafe({
+  safeAddress,
+  composableCowContract,
+}: {
+  safeAddress: string
+  composableCowContract: ComposableCoW
+}): TwapOrdersSafeData[] {
+  const safeApiKit = useSafeApiKit()
+  const [ordersSafeData, setOrdersSafeData] = useState<TwapOrdersSafeData[]>([])
+
+  useEffect(() => {
+    if (!safeApiKit) return
+
+    // TODO: now it fetches only last N transactions, should take into account the pagination
+    const persistOrders = () => {
+      fetchTwapOrdersFromSafe(safeAddress, safeApiKit, composableCowContract).then(setOrdersSafeData)
+    }
+
+    const interval = setInterval(persistOrders, PENDING_TWAP_UPDATE_INTERVAL)
+
+    persistOrders()
+
+    return () => clearInterval(interval)
+  }, [safeAddress, safeApiKit, composableCowContract])
+
+  return ordersSafeData
+}
diff --git a/src/modules/twap/hooks/useFetchTwapPartOrders.ts b/src/modules/twap/hooks/useFetchTwapPartOrders.ts
new file mode 100644
index 0000000000..4c60c7066c
--- /dev/null
+++ b/src/modules/twap/hooks/useFetchTwapPartOrders.ts
@@ -0,0 +1,84 @@
+import { useMemo } from 'react'
+
+import type { Order } from '@cowprotocol/contracts'
+import { OrderParameters, SupportedChainId } from '@cowprotocol/cow-sdk'
+
+import { useAsyncMemo } from 'use-async-memo'
+
+import { ComposableCoW } from 'abis/types'
+import { computeOrderUid } from 'utils/orderUtils/computeOrderUid'
+
+import { TradeableOrderWithSignature, useTwapOrdersTradeableMulticall } from './useTwapOrdersTradeableMulticall'
+
+import { TwapPartOrderItem, TwapPartOrders } from '../state/twapPartOrdersAtom'
+import { TwapOrderInfo } from '../types'
+
+export function useFetchTwapPartOrders(
+  safeAddress: string,
+  chainId: SupportedChainId,
+  composableCowContract: ComposableCoW,
+  ordersInfo: TwapOrderInfo[]
+): TwapPartOrders | null {
+  const ordersToVerifyParams = useMemo(() => {
+    return ordersInfo.map((info) => info.safeData.params)
+  }, [ordersInfo])
+
+  const ordersTradeableData = useTwapOrdersTradeableMulticall(safeAddress, composableCowContract, ordersToVerifyParams)
+
+  const items = useAsyncMemo(
+    () => {
+      if (ordersInfo.length !== ordersTradeableData.length) return null
+
+      const safeAddressLowerCase = safeAddress.toLowerCase()
+
+      return Promise.all(
+        ordersInfo.map(({ id }, index) => {
+          const data = ordersTradeableData[index]
+          return data ? getTwapPartOrderItem(chainId, safeAddressLowerCase, data, id) : Promise.resolve(null)
+        })
+      )
+    },
+    [chainId, safeAddress, ordersInfo, ordersTradeableData],
+    null
+  )
+
+  return useMemo(() => {
+    if (!items) return null
+
+    return ordersInfo.reduce((acc, { id }, index) => {
+      const item = items[index]
+
+      if (item) acc[id] = item
+
+      return acc
+    }, {} as TwapPartOrders)
+  }, [ordersInfo, items])
+}
+
+async function getTwapPartOrderItem(
+  chainId: SupportedChainId,
+  safeAddress: string,
+  data: TradeableOrderWithSignature,
+  twapOrderId: string
+): Promise<TwapPartOrderItem | null> {
+  if (!data) return null
+
+  const { order: partOrder, signature } = data
+  const { sellToken, buyToken, receiver, validTo, appData } = partOrder
+  const fixedOrder = {
+    sellToken,
+    buyToken,
+    receiver,
+    validTo,
+    appData,
+    sellAmount: partOrder.sellAmount.toString(),
+    buyAmount: partOrder.buyAmount.toString(),
+    feeAmount: partOrder.feeAmount.toString(),
+    kind: 'sell', // TODO: discuss it, smart-contract returns bytes here
+    partiallyFillable: partOrder.partiallyFillable,
+  } as Order
+
+  const uid = await computeOrderUid(chainId, safeAddress, fixedOrder)
+
+  return { uid, chainId, safeAddress, twapOrderId, order: fixedOrder as OrderParameters, signature }
+}
diff --git a/src/modules/twap/hooks/useTwapDiscreteOrders.ts b/src/modules/twap/hooks/useTwapDiscreteOrders.ts
new file mode 100644
index 0000000000..1d62408d48
--- /dev/null
+++ b/src/modules/twap/hooks/useTwapDiscreteOrders.ts
@@ -0,0 +1,29 @@
+import { useAtomValue } from 'jotai'
+import { useMemo } from 'react'
+
+import { Order } from 'legacy/state/orders/actions'
+import { useOrdersById } from 'legacy/state/orders/hooks'
+
+import { useWalletInfo } from '../../wallet'
+import { twapPartOrdersListAtom } from '../state/twapPartOrdersAtom'
+
+export type TwapToDiscreteOrders = { [twapOrderId: string]: Order }
+
+export function useTwapDiscreteOrders(): TwapToDiscreteOrders | null {
+  const { chainId } = useWalletInfo()
+  const partOrders = useAtomValue(twapPartOrdersListAtom)
+  const ids = useMemo(() => partOrders.map((item) => item.uid), [partOrders])
+  const orders = useOrdersById({ chainId, ids })
+
+  return useMemo(() => {
+    return partOrders.reduce<TwapToDiscreteOrders>((acc, item) => {
+      const order = orders?.[item.uid]
+
+      if (order) {
+        acc[item.twapOrderId] = order
+      }
+
+      return acc
+    }, {})
+  }, [partOrders, orders])
+}
diff --git a/src/modules/twap/hooks/useTwapOrdersAuthMulticall.ts b/src/modules/twap/hooks/useTwapOrdersAuthMulticall.ts
new file mode 100644
index 0000000000..a4a14ba887
--- /dev/null
+++ b/src/modules/twap/hooks/useTwapOrdersAuthMulticall.ts
@@ -0,0 +1,33 @@
+import { useMemo } from 'react'
+
+import { ListenerOptionsWithGas } from '@uniswap/redux-multicall'
+
+import { ComposableCoW } from 'abis/types/ComposableCoW'
+import { useSingleContractMultipleData } from 'lib/hooks/multicall'
+
+import { TwapOrderInfo, TwapOrdersAuthResult } from '../types'
+
+const DEFAULT_LISTENER_OPTIONS: ListenerOptionsWithGas = { gasRequired: 185_000, blocksPerFetch: 5 }
+
+export function useTwapOrdersAuthMulticall(
+  safeAddress: string,
+  composableCowContract: ComposableCoW,
+  ordersInfo: TwapOrderInfo[]
+): TwapOrdersAuthResult | null {
+  const input = useMemo(() => {
+    return ordersInfo.map(({ id }) => [safeAddress, id])
+  }, [safeAddress, ordersInfo])
+
+  const results = useSingleContractMultipleData(composableCowContract, 'singleOrders', input, DEFAULT_LISTENER_OPTIONS)
+
+  return useMemo(() => {
+    const loadedResults = results.filter((result) => !result.loading)
+
+    if (loadedResults.length !== ordersInfo.length) return null
+
+    return ordersInfo.reduce((acc, val, index) => {
+      acc[val.id] = !!loadedResults[index].result?.[0]
+      return acc
+    }, {} as TwapOrdersAuthResult)
+  }, [ordersInfo, results])
+}
diff --git a/src/modules/twap/hooks/useTwapOrdersTradeableMulticall.ts b/src/modules/twap/hooks/useTwapOrdersTradeableMulticall.ts
new file mode 100644
index 0000000000..a9da06ed31
--- /dev/null
+++ b/src/modules/twap/hooks/useTwapOrdersTradeableMulticall.ts
@@ -0,0 +1,40 @@
+import { useMemo } from 'react'
+
+import { ListenerOptionsWithGas } from '@uniswap/redux-multicall'
+
+import { ComposableCoW, GPv2Order } from 'abis/types/ComposableCoW'
+import { useSingleContractMultipleData } from 'lib/hooks/multicall'
+
+import { ConditionalOrderParams } from '../types'
+
+const DEFAULT_LISTENER_OPTIONS: ListenerOptionsWithGas = { gasRequired: 185_000, blocksPerFetch: 5 }
+
+export type TradeableOrderWithSignature =
+  | {
+      order: GPv2Order.DataStructOutput
+      signature: string
+    }
+  | undefined
+
+export function useTwapOrdersTradeableMulticall(
+  safeAddress: string,
+  composableCowContract: ComposableCoW,
+  conditionalOrderParams: ConditionalOrderParams[]
+): TradeableOrderWithSignature[] {
+  const input = useMemo(() => {
+    return conditionalOrderParams.map((params) => {
+      return [safeAddress, [params.handler, params.salt, params.staticInput], '0x', []]
+    })
+  }, [safeAddress, conditionalOrderParams])
+
+  const results = useSingleContractMultipleData(
+    composableCowContract,
+    'getTradeableOrderWithSignature',
+    input,
+    DEFAULT_LISTENER_OPTIONS
+  )
+
+  return useMemo(() => {
+    return results.filter((result) => !result.loading).map((res) => res.result as TradeableOrderWithSignature)
+  }, [results])
+}
diff --git a/src/modules/twap/services/fetchTwapOrdersFromSafe.ts b/src/modules/twap/services/fetchTwapOrdersFromSafe.ts
new file mode 100644
index 0000000000..48356bb848
--- /dev/null
+++ b/src/modules/twap/services/fetchTwapOrdersFromSafe.ts
@@ -0,0 +1,67 @@
+import type SafeApiKit from '@safe-global/api-kit'
+import type { SafeMultisigTransactionResponse } from '@safe-global/safe-core-sdk-types'
+
+import { isTruthy } from 'legacy/utils/misc'
+
+import { ComposableCoW } from 'abis/types'
+
+import { ConditionalOrderParams } from '../types'
+
+export interface TwapOrdersSafeData {
+  params: ConditionalOrderParams
+  submissionDate: string
+  isExecuted: boolean
+}
+
+// ComposableCoW.create method
+const CREATE_COMPOSABLE_ORDER_SELECTOR = '6bfae1ca'
+
+export async function fetchTwapOrdersFromSafe(
+  safeAddress: string,
+  safeApiKit: SafeApiKit,
+  composableCowContract: ComposableCoW
+): Promise<TwapOrdersSafeData[]> {
+  const allTxs = await safeApiKit.getAllTransactions(safeAddress)
+  const results = allTxs?.results || []
+
+  return results
+    .map((result) => {
+      if (!result.data || !isSafeMultisigTransactionListResponse(result)) return null
+
+      const selectorIndex = result.data.indexOf(CREATE_COMPOSABLE_ORDER_SELECTOR)
+
+      if (selectorIndex < 0) return null
+
+      const callData = '0x' + result.data.substring(selectorIndex)
+
+      const params = parseConditionalOrderParams(safeAddress, composableCowContract, callData)
+
+      if (!params) return null
+
+      return {
+        params,
+        isExecuted: result.isExecuted,
+        submissionDate: result.submissionDate,
+      }
+    })
+    .filter(isTruthy)
+}
+
+function isSafeMultisigTransactionListResponse(response: any): response is SafeMultisigTransactionResponse {
+  return !!response.data && !!response.submissionDate
+}
+
+function parseConditionalOrderParams(
+  safeAddress: string,
+  composableCowContract: ComposableCoW,
+  callData: string
+): ConditionalOrderParams | null {
+  try {
+    const _result = composableCowContract.interface.decodeFunctionData('create', callData)
+    const { params } = _result as any as { params: ConditionalOrderParams }
+
+    return { handler: params.handler, salt: params.salt, staticInput: params.staticInput }
+  } catch (e) {
+    return null
+  }
+}
diff --git a/src/modules/twap/state/twapOrdersListAtom.ts b/src/modules/twap/state/twapOrdersListAtom.ts
new file mode 100644
index 0000000000..8206a3aded
--- /dev/null
+++ b/src/modules/twap/state/twapOrdersListAtom.ts
@@ -0,0 +1,35 @@
+import { atom } from 'jotai'
+import { atomWithStorage } from 'jotai/utils'
+
+import deepEqual from 'fast-deep-equal'
+
+import { tokensByAddressAtom } from 'modules/tokensList/state/tokensListAtom'
+import { walletInfoAtom } from 'modules/wallet/api/state'
+
+import { TwapOrderItem } from '../types'
+import { emulateTwapAsOrder } from '../utils/emulateTwapAsOrder'
+
+export type TwapOrdersList = { [key: string]: TwapOrderItem }
+
+export const twapOrdersListAtom = atomWithStorage<TwapOrdersList>('twap-orders-list:v2', {})
+
+export const updateTwapOrdersListAtom = atom(null, (get, set, nextState: TwapOrdersList) => {
+  const currentState = get(twapOrdersListAtom)
+
+  if (!deepEqual(currentState, nextState)) {
+    set(twapOrdersListAtom, nextState)
+  }
+})
+
+export const emulatedTwapOrdersAtom = atom((get) => {
+  const { account, chainId } = get(walletInfoAtom)
+  const tokens = get(tokensByAddressAtom)
+  const orders = Object.values(get(twapOrdersListAtom))
+  const accountLowerCase = account?.toLowerCase()
+
+  if (!accountLowerCase) return []
+
+  return orders
+    .filter((order) => order.chainId === chainId && order.safeAddress.toLowerCase() === accountLowerCase)
+    .map((order) => emulateTwapAsOrder(tokens, order))
+})
diff --git a/src/modules/twap/state/twapPartOrdersAtom.ts b/src/modules/twap/state/twapPartOrdersAtom.ts
new file mode 100644
index 0000000000..d26582ed92
--- /dev/null
+++ b/src/modules/twap/state/twapPartOrdersAtom.ts
@@ -0,0 +1,40 @@
+import { atom } from 'jotai'
+import { atomWithStorage } from 'jotai/utils'
+
+import { OrderParameters, SupportedChainId } from '@cowprotocol/cow-sdk'
+
+import deepEqual from 'fast-deep-equal'
+
+import { walletInfoAtom } from 'modules/wallet/api/state'
+
+export interface TwapPartOrderItem {
+  uid: string
+  chainId: SupportedChainId
+  safeAddress: string
+  twapOrderId: string
+  order: OrderParameters
+  signature: string
+}
+export type TwapPartOrders = { [twapOrderHash: string]: TwapPartOrderItem }
+
+export const twapPartOrdersAtom = atomWithStorage<TwapPartOrders>('twap-part-orders-list:v1', {})
+
+export const updateTwapPartOrdersAtom = atom(null, (get, set, nextState: TwapPartOrders) => {
+  const currentState = get(twapPartOrdersAtom)
+
+  if (!deepEqual(currentState, nextState)) {
+    set(twapPartOrdersAtom, nextState)
+  }
+})
+
+export const twapPartOrdersListAtom = atom((get) => {
+  const { account, chainId } = get(walletInfoAtom)
+
+  if (!account || !chainId) return []
+
+  const accountLowerCase = account.toLowerCase()
+
+  return Object.values(get(twapPartOrdersAtom)).filter(
+    (order) => order.safeAddress === accountLowerCase && order.chainId === chainId
+  )
+})
diff --git a/src/modules/twap/types.ts b/src/modules/twap/types.ts
index ee2bbc698a..8349aa348f 100644
--- a/src/modules/twap/types.ts
+++ b/src/modules/twap/types.ts
@@ -1,5 +1,8 @@
+import { SupportedChainId } from '@cowprotocol/cow-sdk'
 import { CurrencyAmount, Token } from '@uniswap/sdk-core'
 
+import { TwapOrdersSafeData } from './services/fetchTwapOrdersFromSafe'
+
 // Read more: https://github.com/rndlabs/composable-cow#data-structure
 export interface TWAPOrder {
   sellAmount: CurrencyAmount<Token>
@@ -17,8 +20,43 @@ export interface TWAPOrderStruct {
   receiver: string
   partSellAmount: string
   minPartLimit: string
+  // timeStart
   t0: number
+  // numOfParts
   n: number
+  // timeInterval
   t: number
   span: number
 }
+
+export enum TwapOrderStatus {
+  WaitSigning = 'WaitSigning',
+  Pending = 'Pending',
+  Scheduled = 'Scheduled',
+  Cancelled = 'Cancelled',
+  Expired = 'Expired',
+}
+
+export interface TwapOrderItem {
+  order: TWAPOrderStruct
+  status: TwapOrderStatus
+  chainId: SupportedChainId
+  safeAddress: string
+  hash: string
+  submissionDate: string
+}
+
+export interface ConditionalOrderParams {
+  staticInput: string
+  salt: string
+  handler: string
+}
+
+export interface TwapOrderInfo {
+  id: string
+  orderStruct: TWAPOrderStruct
+  safeData: TwapOrdersSafeData
+  isExpired: boolean
+}
+
+export type TwapOrdersAuthResult = { [key: string]: boolean }
diff --git a/src/modules/twap/updaters/TwapOrdersUpdater.tsx b/src/modules/twap/updaters/TwapOrdersUpdater.tsx
new file mode 100644
index 0000000000..8b3e4de30a
--- /dev/null
+++ b/src/modules/twap/updaters/TwapOrdersUpdater.tsx
@@ -0,0 +1,80 @@
+import { useAtomValue, useUpdateAtom } from 'jotai/utils'
+import { useEffect, useMemo } from 'react'
+
+import { SupportedChainId } from '@cowprotocol/cow-sdk'
+
+import { ComposableCoW } from 'abis/types'
+
+import { TWAP_NOT_PENDING_STATUSES } from '../const'
+import { useFetchTwapOrdersFromSafe } from '../hooks/useFetchTwapOrdersFromSafe'
+import { useFetchTwapPartOrders } from '../hooks/useFetchTwapPartOrders'
+import { useTwapDiscreteOrders } from '../hooks/useTwapDiscreteOrders'
+import { useTwapOrdersAuthMulticall } from '../hooks/useTwapOrdersAuthMulticall'
+import { twapOrdersListAtom, updateTwapOrdersListAtom } from '../state/twapOrdersListAtom'
+import { updateTwapPartOrdersAtom } from '../state/twapPartOrdersAtom'
+import { TwapOrderInfo } from '../types'
+import { buildTwapOrdersItems } from '../utils/buildTwapOrdersItems'
+import { getConditionalOrderId } from '../utils/getConditionalOrderId'
+import { isTwapOrderExpired } from '../utils/getTwapOrderStatus'
+import { parseTwapOrderStruct } from '../utils/parseTwapOrderStruct'
+
+export function TwapOrdersUpdater(props: {
+  safeAddress: string
+  chainId: SupportedChainId
+  composableCowContract: ComposableCoW
+}) {
+  const { safeAddress, chainId, composableCowContract } = props
+
+  const twapDiscreteOrders = useTwapDiscreteOrders()
+  const twapOrdersList = useAtomValue(twapOrdersListAtom)
+  const setTwapOrders = useUpdateAtom(updateTwapOrdersListAtom)
+  const updateTwapPartOrders = useUpdateAtom(updateTwapPartOrdersAtom)
+  const ordersSafeData = useFetchTwapOrdersFromSafe(props)
+
+  const allOrdersInfo: TwapOrderInfo[] = useMemo(() => {
+    return ordersSafeData.map((data) => {
+      const id = getConditionalOrderId(data.params)
+      const order = parseTwapOrderStruct(data.params.staticInput)
+
+      return {
+        id,
+        orderStruct: order,
+        safeData: data,
+        isExpired: isTwapOrderExpired(order),
+      }
+    })
+  }, [ordersSafeData])
+
+  // Here we can split all orders in two groups: 1. Not signed + expired, 2. Open + cancelled
+  const openOrCancelledOrders = useMemo(() => {
+    return allOrdersInfo.filter((info) => {
+      const existedOrder = twapOrdersList[info.id]
+
+      if (existedOrder) {
+        return !TWAP_NOT_PENDING_STATUSES.includes(existedOrder.status)
+      }
+
+      return !info.isExpired && info.safeData.isExecuted
+    })
+  }, [allOrdersInfo, twapOrdersList])
+
+  const partOrders = useFetchTwapPartOrders(safeAddress, chainId, composableCowContract, openOrCancelledOrders)
+  // Here we know which orders are cancelled: if it's auth !== true, then it's cancelled
+  const ordersAuthResult = useTwapOrdersAuthMulticall(safeAddress, composableCowContract, openOrCancelledOrders)
+
+  useEffect(() => {
+    if (!ordersAuthResult || !twapDiscreteOrders) return
+
+    const items = buildTwapOrdersItems(chainId, safeAddress, allOrdersInfo, ordersAuthResult, twapDiscreteOrders)
+
+    setTwapOrders(items)
+  }, [chainId, safeAddress, allOrdersInfo, ordersAuthResult, twapDiscreteOrders, setTwapOrders])
+
+  useEffect(() => {
+    if (!partOrders) return
+
+    updateTwapPartOrders(partOrders)
+  }, [partOrders, updateTwapPartOrders])
+
+  return null
+}
diff --git a/src/modules/twap/utils/buildTwapOrdersItems.ts b/src/modules/twap/utils/buildTwapOrdersItems.ts
new file mode 100644
index 0000000000..6f95c30d40
--- /dev/null
+++ b/src/modules/twap/utils/buildTwapOrdersItems.ts
@@ -0,0 +1,47 @@
+import { SupportedChainId } from '@cowprotocol/cow-sdk'
+
+import { Order } from 'legacy/state/orders/actions'
+
+import { getTwapOrderStatus } from './getTwapOrderStatus'
+import { parseTwapOrderStruct } from './parseTwapOrderStruct'
+
+import { TwapToDiscreteOrders } from '../hooks/useTwapDiscreteOrders'
+import { TwapOrdersSafeData } from '../services/fetchTwapOrdersFromSafe'
+import { TwapOrdersList } from '../state/twapOrdersListAtom'
+import { TwapOrderItem, TwapOrderInfo, TwapOrdersAuthResult } from '../types'
+
+export function buildTwapOrdersItems(
+  chainId: SupportedChainId,
+  safeAddress: string,
+  ordersInfo: TwapOrderInfo[],
+  ordersAuthResult: TwapOrdersAuthResult,
+  discreteOrders: TwapToDiscreteOrders
+): TwapOrdersList {
+  return ordersInfo.reduce<TwapOrdersList>((acc, { safeData, id }) => {
+    acc[id] = getTwapOrderItem(chainId, safeAddress, safeData, id, ordersAuthResult[id], discreteOrders[id])
+    return acc
+  }, {})
+}
+
+function getTwapOrderItem(
+  chainId: SupportedChainId,
+  safeAddress: string,
+  safeData: TwapOrdersSafeData,
+  hash: string,
+  authorized: boolean,
+  discreteOrder: Order | undefined
+): TwapOrderItem {
+  const { params, submissionDate, isExecuted } = safeData
+
+  const order = parseTwapOrderStruct(params.staticInput)
+  const status = getTwapOrderStatus(order, isExecuted, authorized, discreteOrder)
+
+  return {
+    order,
+    status,
+    chainId,
+    safeAddress,
+    hash,
+    submissionDate,
+  }
+}
diff --git a/src/modules/twap/utils/emulateTwapAsOrder.ts b/src/modules/twap/utils/emulateTwapAsOrder.ts
new file mode 100644
index 0000000000..6f3d7263ab
--- /dev/null
+++ b/src/modules/twap/utils/emulateTwapAsOrder.ts
@@ -0,0 +1,51 @@
+import { EnrichedOrder, OrderClass, OrderKind, SigningScheme, OrderStatus } from '@cowprotocol/cow-sdk'
+
+import { TokensByAddress } from 'modules/tokensList/state/tokensListAtom'
+
+import { TwapOrderItem, TwapOrderStatus } from '../types'
+
+// TODO: add FULFILLED status
+const statusMap: Record<TwapOrderStatus, OrderStatus> = {
+  [TwapOrderStatus.Pending]: OrderStatus.OPEN,
+  [TwapOrderStatus.Scheduled]: OrderStatus.OPEN,
+  [TwapOrderStatus.WaitSigning]: OrderStatus.PRESIGNATURE_PENDING,
+  [TwapOrderStatus.Cancelled]: OrderStatus.CANCELLED,
+  [TwapOrderStatus.Expired]: OrderStatus.EXPIRED,
+}
+
+export function emulateTwapAsOrder(tokens: TokensByAddress, item: TwapOrderItem): EnrichedOrder {
+  const { safeAddress, hash, status } = item
+  const { sellToken, buyToken, partSellAmount, minPartLimit, n, t } = item.order
+  const numOfParts = BigInt(n)
+  const sellAmount = BigInt(partSellAmount) * numOfParts
+  const buyAmount = BigInt(minPartLimit) * numOfParts
+
+  const creationTime = new Date(item.submissionDate)
+  const expirationTime = new Date(creationTime.getTime() + t * n * 1000)
+
+  return {
+    signingScheme: SigningScheme.EIP1271,
+    status: statusMap[status],
+    sellToken,
+    buyToken,
+    validTo: Math.ceil(expirationTime.getTime() / 1000),
+    uid: hash,
+    sellAmount: sellAmount.toString(),
+    buyAmount: buyAmount.toString(),
+    kind: OrderKind.SELL,
+    partiallyFillable: true,
+    creationDate: creationTime.toISOString(),
+    class: OrderClass.LIMIT,
+    owner: safeAddress,
+    // TODO: fulfill data
+    signature: '',
+    appData: '',
+    totalFee: '0',
+    feeAmount: '0',
+    executedSellAmount: '0',
+    executedSellAmountBeforeFees: '0',
+    executedBuyAmount: '0',
+    executedFeeAmount: '0',
+    invalidated: false,
+  }
+}
diff --git a/src/modules/twap/utils/getConditionalOrderId.ts b/src/modules/twap/utils/getConditionalOrderId.ts
new file mode 100644
index 0000000000..74200135e2
--- /dev/null
+++ b/src/modules/twap/utils/getConditionalOrderId.ts
@@ -0,0 +1,10 @@
+import { defaultAbiCoder } from '@ethersproject/abi'
+import { keccak256 } from '@ethersproject/keccak256'
+
+import { ConditionalOrderParams } from '../types'
+
+const CONDITIONAL_ORDER_PARAMS_STRUCT = 'tuple(address handler, bytes32 salt, bytes staticInput)'
+
+export function getConditionalOrderId(params: ConditionalOrderParams): string {
+  return keccak256(defaultAbiCoder.encode([CONDITIONAL_ORDER_PARAMS_STRUCT], [params]))
+}
diff --git a/src/modules/twap/utils/getTwapOrderStatus.ts b/src/modules/twap/utils/getTwapOrderStatus.ts
new file mode 100644
index 0000000000..b12d3ef727
--- /dev/null
+++ b/src/modules/twap/utils/getTwapOrderStatus.ts
@@ -0,0 +1,28 @@
+import { Order, PENDING_STATES } from 'legacy/state/orders/actions'
+
+import { TwapOrderStatus, TWAPOrderStruct } from '../types'
+
+export function getTwapOrderStatus(
+  order: TWAPOrderStruct,
+  isExecuted: boolean,
+  auth: boolean,
+  discreteOrder: Order | undefined
+): TwapOrderStatus {
+  if (isTwapOrderExpired(order)) return TwapOrderStatus.Expired
+
+  if (!isExecuted) return TwapOrderStatus.WaitSigning
+
+  if (!auth) return TwapOrderStatus.Cancelled
+
+  if (discreteOrder && PENDING_STATES.includes(discreteOrder.status)) return TwapOrderStatus.Pending
+
+  return TwapOrderStatus.Scheduled
+}
+
+export function isTwapOrderExpired(order: TWAPOrderStruct): boolean {
+  const { t0: startTime, n: numOfParts, t: timeInterval } = order
+  const endTime = startTime + timeInterval * numOfParts
+  const nowTimestamp = Math.ceil(Date.now() / 1000)
+
+  return nowTimestamp > endTime
+}
diff --git a/src/modules/twap/utils/parseTwapOrderStruct.ts b/src/modules/twap/utils/parseTwapOrderStruct.ts
new file mode 100644
index 0000000000..5f4685258f
--- /dev/null
+++ b/src/modules/twap/utils/parseTwapOrderStruct.ts
@@ -0,0 +1,32 @@
+import { defaultAbiCoder, ParamType } from '@ethersproject/abi'
+import { BigNumber } from '@ethersproject/bignumber'
+
+import { TWAPOrderStruct } from '../types'
+
+const TWAP_STRUCT_ABI = [
+  { name: 'sellToken', type: 'address' },
+  { name: 'buyToken', type: 'address' },
+  { name: 'receiver', type: 'address' },
+  { name: 'partSellAmount', type: 'uint256' },
+  { name: 'minPartLimit', type: 'uint256' },
+  { name: 't0', type: 'uint256' },
+  { name: 'n', type: 'uint256' },
+  { name: 't', type: 'uint256' },
+  { name: 'span', type: 'uint256' },
+] as ParamType[]
+
+export function parseTwapOrderStruct(staticInput: string): TWAPOrderStruct {
+  const rawData = defaultAbiCoder.decode(TWAP_STRUCT_ABI, staticInput)
+
+  return {
+    sellToken: rawData['sellToken'],
+    buyToken: rawData['buyToken'],
+    receiver: rawData['receiver'],
+    partSellAmount: (rawData['partSellAmount'] as BigNumber).toHexString(),
+    minPartLimit: (rawData['minPartLimit'] as BigNumber).toHexString(),
+    t0: (rawData['t0'] as BigNumber).toNumber(),
+    n: (rawData['n'] as BigNumber).toNumber(),
+    t: (rawData['t'] as BigNumber).toNumber(),
+    span: (rawData['span'] as BigNumber).toNumber(),
+  }
+}
diff --git a/src/pages/AdvancedOrders/index.tsx b/src/pages/AdvancedOrders/index.tsx
index f948e744fa..0a777311fc 100644
--- a/src/pages/AdvancedOrders/index.tsx
+++ b/src/pages/AdvancedOrders/index.tsx
@@ -2,6 +2,7 @@ import { AdvancedOrdersWidget } from 'modules/advancedOrders'
 import { OrdersTableWidget } from 'modules/ordersTable'
 import * as styledEl from 'modules/trade/pure/TradePageLayout'
 import { TradeFormValidationUpdater } from 'modules/tradeFormValidation'
+import { TwapFormWidget } from 'modules/twap'
 
 export default function AdvancedOrdersPage() {
   return (
@@ -12,7 +13,10 @@ export default function AdvancedOrdersPage() {
       {/*TODO: add isUnlocked value*/}
       <styledEl.PageWrapper isUnlocked={true}>
         <styledEl.PrimaryWrapper>
-          <AdvancedOrdersWidget />
+          <AdvancedOrdersWidget>
+            {/*TODO: conditionally display a widget for current advanced order type*/}
+            <TwapFormWidget />
+          </AdvancedOrdersWidget>
         </styledEl.PrimaryWrapper>
 
         <styledEl.SecondaryWrapper>
diff --git a/src/utils/orderUtils/computeOrderUid.ts b/src/utils/orderUtils/computeOrderUid.ts
new file mode 100644
index 0000000000..ac92236673
--- /dev/null
+++ b/src/utils/orderUtils/computeOrderUid.ts
@@ -0,0 +1,9 @@
+import type { Order } from '@cowprotocol/contracts'
+import { OrderSigningUtils, SupportedChainId } from '@cowprotocol/cow-sdk'
+
+export async function computeOrderUid(chainId: SupportedChainId, owner: string, order: Order): Promise<string> {
+  const { computeOrderUid: _computeOrderUid } = await import('@cowprotocol/contracts')
+  const domain = await OrderSigningUtils.getDomain(chainId)
+
+  return _computeOrderUid(domain, order, owner)
+}

From d4f841f4523765e3ce97ab36b8b98b4e2d921493 Mon Sep 17 00:00:00 2001
From: Leandro <alfetopito@users.noreply.github.com>
Date: Mon, 12 Jun 2023 03:42:23 -0700
Subject: [PATCH 10/67] feat(twap): twap review order - pt1 (#2629)

* feat: start the review twap order confirmation

* feat: add limit price

* feat: refactor and reuse some components

* feat: add min received row

* feat: make ExecutionPrice a bit more generic

* feat: update LimitPriceRow

* feat: implement limit price calculation for TWAP review

* refactor: use updateState from useTradeState

* refactor: hide horrible button style

* refactor: move slippage access to parent component

* refactor: simplified MinReceivedRow props

* feat: add usd value for min receive amount

---------

Co-authored-by: nenadV91 <nenadwebdevelop@gmail.com>
---
 src/common/pure/ExecutionPrice/index.tsx      | 16 ++++-
 src/common/pure/RateInfo/index.tsx            |  5 +-
 .../TwapConfirmDetails/LimitPriceRow.tsx      | 32 +++++++++
 .../TwapConfirmDetails/MinReceivedRow.tsx     | 29 ++++++++
 .../TwapConfirmDetails/SlippageRow.tsx        | 16 +++++
 .../containers/TwapConfirmDetails/index.tsx   | 71 +++++++++++++++++++
 .../containers/TwapConfirmDetails/styled.ts   | 22 ++++++
 .../containers/TwapConfirmModal/index.tsx     | 16 ++++-
 .../twap/containers/TwapFormWidget/index.tsx  | 15 ++--
 .../twap/pure/ConfirmDetailsItem/index.tsx    | 48 +++++++++++++
 .../twap/pure/ConfirmDetailsItem/styled.ts    | 23 ++++++
 src/modules/twap/state/twapOrderAtom.ts       | 13 ++--
 .../twap/state/twapOrdersSettingsAtom.ts      | 15 +++-
 13 files changed, 297 insertions(+), 24 deletions(-)
 create mode 100644 src/modules/twap/containers/TwapConfirmDetails/LimitPriceRow.tsx
 create mode 100644 src/modules/twap/containers/TwapConfirmDetails/MinReceivedRow.tsx
 create mode 100644 src/modules/twap/containers/TwapConfirmDetails/SlippageRow.tsx
 create mode 100644 src/modules/twap/containers/TwapConfirmDetails/index.tsx
 create mode 100644 src/modules/twap/containers/TwapConfirmDetails/styled.ts
 create mode 100644 src/modules/twap/pure/ConfirmDetailsItem/index.tsx
 create mode 100644 src/modules/twap/pure/ConfirmDetailsItem/styled.ts

diff --git a/src/common/pure/ExecutionPrice/index.tsx b/src/common/pure/ExecutionPrice/index.tsx
index 13b7f6ae04..82e66cda2f 100644
--- a/src/common/pure/ExecutionPrice/index.tsx
+++ b/src/common/pure/ExecutionPrice/index.tsx
@@ -2,21 +2,33 @@ import { Currency, Price } from '@uniswap/sdk-core'
 
 import { FiatAmount } from 'common/pure/FiatAmount'
 import { TokenAmount } from 'common/pure/TokenAmount'
+import tryParseCurrencyAmount from 'lib/utils/tryParseCurrencyAmount'
 
 import { useExecutionPriceFiat } from './hooks/useExecutionPriceFiat'
 
 export interface ExecutionPriceProps {
   executionPrice: Price<Currency, Currency>
   isInverted: boolean
+  showBaseCurrency?: boolean
+  separatorSymbol?: string
 }
 
-export function ExecutionPrice({ executionPrice, isInverted }: ExecutionPriceProps) {
+export function ExecutionPrice({
+  executionPrice,
+  isInverted,
+  showBaseCurrency,
+  separatorSymbol = '≈',
+}: ExecutionPriceProps) {
   const executionPriceFiat = useExecutionPriceFiat(executionPrice, isInverted)
   const quoteCurrency = isInverted ? executionPrice?.baseCurrency : executionPrice?.quoteCurrency
+  const baseCurrency = isInverted ? executionPrice?.quoteCurrency : executionPrice?.baseCurrency
+  const oneBaseCurrency = tryParseCurrencyAmount('1', baseCurrency)
 
   return (
     <span>
-      ≈ <TokenAmount amount={isInverted ? executionPrice.invert() : executionPrice} tokenSymbol={quoteCurrency} />
+      {showBaseCurrency && <TokenAmount amount={oneBaseCurrency} tokenSymbol={baseCurrency} />}
+      {` ${separatorSymbol} `}
+      <TokenAmount amount={isInverted ? executionPrice.invert() : executionPrice} tokenSymbol={quoteCurrency} />
       {executionPriceFiat && (
         <i>
           &nbsp;(
diff --git a/src/common/pure/RateInfo/index.tsx b/src/common/pure/RateInfo/index.tsx
index 70f24dc1ca..437f63076b 100644
--- a/src/common/pure/RateInfo/index.tsx
+++ b/src/common/pure/RateInfo/index.tsx
@@ -38,6 +38,7 @@ export interface RateInfoProps {
   isInvertedState?: [boolean, Dispatch<SetStateAction<boolean>>]
   rateInfoParams: RateInfoParams
   opacitySymbol?: boolean
+  noFiat?: boolean
 }
 
 const Wrapper = styled.div<{ stylized: boolean }>`
@@ -132,6 +133,7 @@ export function RateInfo({
   prependSymbol = true,
   isInvertedState,
   opacitySymbol = false,
+  noFiat = false,
 }: RateInfoProps) {
   const { chainId, inputCurrencyAmount, outputCurrencyAmount, activeRateFiatAmount, invertedActiveRateFiatAmount } =
     rateInfoParams
@@ -150,8 +152,9 @@ export function RateInfo({
   }, [currentIsInverted, activeRate])
 
   const fiatAmount = useMemo(() => {
+    if (noFiat) return null
     return currentIsInverted ? invertedActiveRateFiatAmount : activeRateFiatAmount
-  }, [currentIsInverted, activeRateFiatAmount, invertedActiveRateFiatAmount])
+  }, [noFiat, currentIsInverted, invertedActiveRateFiatAmount, activeRateFiatAmount])
 
   const rateInputCurrency = useMemo(() => {
     return currentIsInverted ? outputCurrency : inputCurrency
diff --git a/src/modules/twap/containers/TwapConfirmDetails/LimitPriceRow.tsx b/src/modules/twap/containers/TwapConfirmDetails/LimitPriceRow.tsx
new file mode 100644
index 0000000000..c3379880ba
--- /dev/null
+++ b/src/modules/twap/containers/TwapConfirmDetails/LimitPriceRow.tsx
@@ -0,0 +1,32 @@
+import { Dispatch, SetStateAction } from 'react'
+
+import { Currency, Price } from '@uniswap/sdk-core'
+
+import { Nullish } from 'types'
+
+import { ConfirmDetailsItem } from 'modules/twap/pure/ConfirmDetailsItem'
+
+import { ExecutionPrice } from 'common/pure/ExecutionPrice'
+import { RateWrapper } from 'common/pure/RateInfo'
+
+type Props = {
+  price: Nullish<Price<Currency, Currency>>
+  isInvertedState: [boolean, Dispatch<SetStateAction<boolean>>]
+}
+
+export function LimitPriceRow(props: Props) {
+  const { price, isInvertedState } = props
+  const [isInverted, setIsInverted] = isInvertedState
+
+  return (
+    <RateWrapper onClick={() => setIsInverted((curr) => !curr)}>
+      <ConfirmDetailsItem tooltip="TODO: limit price tooltip text" label="Limit price (incl fee/slippage)">
+        {price ? (
+          <ExecutionPrice executionPrice={price} isInverted={isInverted} showBaseCurrency separatorSymbol="=" />
+        ) : (
+          '-'
+        )}
+      </ConfirmDetailsItem>
+    </RateWrapper>
+  )
+}
diff --git a/src/modules/twap/containers/TwapConfirmDetails/MinReceivedRow.tsx b/src/modules/twap/containers/TwapConfirmDetails/MinReceivedRow.tsx
new file mode 100644
index 0000000000..db9b51cd40
--- /dev/null
+++ b/src/modules/twap/containers/TwapConfirmDetails/MinReceivedRow.tsx
@@ -0,0 +1,29 @@
+import { Currency, CurrencyAmount } from '@uniswap/sdk-core'
+
+import { Nullish } from 'types'
+
+import { ConfirmDetailsItem } from 'modules/twap/pure/ConfirmDetailsItem'
+
+import { FiatAmount } from 'common/pure/FiatAmount'
+import { TokenAmount } from 'common/pure/TokenAmount'
+
+type Props = {
+  amount: Nullish<CurrencyAmount<Currency>>
+  usdAmount: Nullish<CurrencyAmount<Currency>>
+}
+
+export function MinReceivedRow(props: Props) {
+  const { amount, usdAmount } = props
+
+  return (
+    <ConfirmDetailsItem tooltip="TODO: Min received tooltip" label="Min received (incl. fee)">
+      <TokenAmount amount={amount} defaultValue="-" tokenSymbol={amount?.currency} />
+      {usdAmount && (
+        <i>
+          &nbsp;(
+          <FiatAmount amount={usdAmount} />)
+        </i>
+      )}
+    </ConfirmDetailsItem>
+  )
+}
diff --git a/src/modules/twap/containers/TwapConfirmDetails/SlippageRow.tsx b/src/modules/twap/containers/TwapConfirmDetails/SlippageRow.tsx
new file mode 100644
index 0000000000..ac9ba5ef6b
--- /dev/null
+++ b/src/modules/twap/containers/TwapConfirmDetails/SlippageRow.tsx
@@ -0,0 +1,16 @@
+import { Percent } from '@uniswap/sdk-core'
+
+import { RowSlippage } from 'modules/swap/containers/Row/RowSlippage'
+import { ConfirmDetailsItem } from 'modules/twap/pure/ConfirmDetailsItem'
+
+export type SlippageRowProps = {
+  slippage: Percent
+}
+
+export function SlippageRow({ slippage }: SlippageRowProps) {
+  return (
+    <ConfirmDetailsItem>
+      <RowSlippage allowedSlippage={slippage} showSettingOnClick={false} />
+    </ConfirmDetailsItem>
+  )
+}
diff --git a/src/modules/twap/containers/TwapConfirmDetails/index.tsx b/src/modules/twap/containers/TwapConfirmDetails/index.tsx
new file mode 100644
index 0000000000..0dc12bb9f0
--- /dev/null
+++ b/src/modules/twap/containers/TwapConfirmDetails/index.tsx
@@ -0,0 +1,71 @@
+import { useAtomValue } from 'jotai'
+import { Dispatch, SetStateAction, useMemo } from 'react'
+
+import { Currency, CurrencyAmount, Percent } from '@uniswap/sdk-core'
+
+import { Nullish } from 'types'
+
+import { ONE_HUNDRED_PERCENT } from 'legacy/constants/misc'
+import { useHigherUSDValue } from 'legacy/hooks/useStablecoinPrice'
+
+import { twapOrderSlippage } from 'modules/twap/state/twapOrdersSettingsAtom'
+
+import { usePrice } from 'common/hooks/usePrice'
+import { useRateInfoParams } from 'common/hooks/useRateInfoParams'
+import { CurrencyPreviewInfo } from 'common/pure/CurrencyAmountPreview'
+
+import { LimitPriceRow } from './LimitPriceRow'
+import { MinReceivedRow } from './MinReceivedRow'
+import { SlippageRow } from './SlippageRow'
+import * as styledEl from './styled'
+
+type Props = {
+  inputCurrencyInfo: CurrencyPreviewInfo
+  outputCurrencyInfo: CurrencyPreviewInfo
+  isInvertedState: [boolean, Dispatch<SetStateAction<boolean>>]
+}
+
+export function TwapConfirmDetails(props: Props) {
+  const { inputCurrencyInfo, outputCurrencyInfo, isInvertedState } = props
+
+  const rateInfoParams = useRateInfoParams(inputCurrencyInfo.amount, outputCurrencyInfo.amount)
+  const allowedSlippage = useAtomValue(twapOrderSlippage)
+
+  // This is the minimum per part
+  const minReceivedAmountPerPart = useMemo(
+    () => getSlippageAdjustedBuyAmount(outputCurrencyInfo.amount, allowedSlippage),
+    [allowedSlippage, outputCurrencyInfo.amount]
+  )
+  const minReceivedUsdAmount = useHigherUSDValue(minReceivedAmountPerPart)
+
+  // Limit price is the same for all parts
+  const limitPrice = usePrice(inputCurrencyInfo.amount, minReceivedAmountPerPart)
+
+  return (
+    <styledEl.Wrapper>
+      {/* Price */}
+      <styledEl.StyledRateInfo
+        label="Price"
+        stylized={true}
+        rateInfoParams={rateInfoParams}
+        isInvertedState={isInvertedState}
+      />
+
+      {/* Slippage */}
+      <SlippageRow slippage={allowedSlippage} />
+
+      {/* Limit Price */}
+      <LimitPriceRow price={limitPrice} isInvertedState={isInvertedState} />
+
+      {/* Min received */}
+      <MinReceivedRow amount={minReceivedAmountPerPart} usdAmount={minReceivedUsdAmount} />
+    </styledEl.Wrapper>
+  )
+}
+
+function getSlippageAdjustedBuyAmount(
+  buyAmount: Nullish<CurrencyAmount<Currency>>,
+  slippage: Percent
+): CurrencyAmount<Currency> | undefined {
+  return buyAmount?.multiply(ONE_HUNDRED_PERCENT.subtract(slippage))
+}
diff --git a/src/modules/twap/containers/TwapConfirmDetails/styled.ts b/src/modules/twap/containers/TwapConfirmDetails/styled.ts
new file mode 100644
index 0000000000..ceba27b052
--- /dev/null
+++ b/src/modules/twap/containers/TwapConfirmDetails/styled.ts
@@ -0,0 +1,22 @@
+import styled from 'styled-components/macro'
+
+import { RateInfo } from 'common/pure/RateInfo'
+
+export const Wrapper = styled.div`
+  padding: 1rem 0;
+`
+
+export const StyledRateInfo = styled(RateInfo)`
+  font-size: 13px;
+  font-weight: 500;
+  margin: 0 auto;
+`
+
+export const ItemWithArrow = styled.div`
+  display: flex;
+  align-items: center;
+
+  > svg:first-child {
+    margin-right: 5px;
+  }
+`
diff --git a/src/modules/twap/containers/TwapConfirmModal/index.tsx b/src/modules/twap/containers/TwapConfirmModal/index.tsx
index 90bbe26cf3..538e773f1d 100644
--- a/src/modules/twap/containers/TwapConfirmModal/index.tsx
+++ b/src/modules/twap/containers/TwapConfirmModal/index.tsx
@@ -1,9 +1,10 @@
-import React from 'react'
+import { useState } from 'react'
 
 import { useAdvancedOrdersDerivedState } from 'modules/advancedOrders'
 import { TradeConfirmation, TradeConfirmModal, useTradeConfirmActions } from 'modules/trade'
 
 import { useCreateTwapOrder } from '../../hooks/useCreateTwapOrder'
+import { TwapConfirmDetails } from '../TwapConfirmDetails'
 
 export function TwapConfirmModal() {
   const {
@@ -18,6 +19,8 @@ export function TwapConfirmModal() {
   const tradeConfirmActions = useTradeConfirmActions()
   const createTwapOrder = useCreateTwapOrder()
 
+  const isInvertedState = useState(false)
+
   // TODO: add conditions based on warnings
   const isConfirmDisabled = false
 
@@ -32,12 +35,14 @@ export function TwapConfirmModal() {
     amount: inputCurrencyAmount,
     fiatAmount: inputCurrencyFiatAmount,
     balance: inputCurrencyBalance,
+    label: 'Sell amount',
   }
 
   const outputCurrencyInfo = {
     amount: outputCurrencyAmount,
     fiatAmount: outputCurrencyFiatAmount,
     balance: outputCurrencyBalance,
+    label: 'Estimated receive amount',
   }
 
   return (
@@ -51,7 +56,14 @@ export function TwapConfirmModal() {
         isConfirmDisabled={isConfirmDisabled}
         priceImpact={priceImpact}
       >
-        <>{/*TODO: display details*/}</>
+        <>
+          <>{/*TODO: display details*/}</>
+          <TwapConfirmDetails
+            inputCurrencyInfo={inputCurrencyInfo}
+            outputCurrencyInfo={outputCurrencyInfo}
+            isInvertedState={isInvertedState}
+          />
+        </>
       </TradeConfirmation>
     </TradeConfirmModal>
   )
diff --git a/src/modules/twap/containers/TwapFormWidget/index.tsx b/src/modules/twap/containers/TwapFormWidget/index.tsx
index 617a974a15..28d170f25c 100644
--- a/src/modules/twap/containers/TwapFormWidget/index.tsx
+++ b/src/modules/twap/containers/TwapFormWidget/index.tsx
@@ -2,13 +2,10 @@ import { useAtomValue } from 'jotai'
 import { useUpdateAtom } from 'jotai/utils'
 import { useEffect } from 'react'
 
-import {
-  useAdvancedOrdersDerivedState,
-  useAdvancedOrdersRawState,
-  useUpdateAdvancedOrdersRawState,
-} from 'modules/advancedOrders'
+import { useAdvancedOrdersDerivedState, useAdvancedOrdersRawState } from 'modules/advancedOrders'
 import { useComposableCowContract } from 'modules/advancedOrders/hooks/useComposableCowContract'
 import { useIsWrapOrUnwrap } from 'modules/trade/hooks/useIsWrapOrUnwrap'
+import { useTradeState } from 'modules/trade/hooks/useTradeState'
 import { TradeNumberInput } from 'modules/trade/pure/TradeNumberInput'
 import { TradeTextBox } from 'modules/trade/pure/TradeTextBox'
 import { QuoteObserverUpdater } from 'modules/twap/updaters/QuoteObserverUpdater'
@@ -18,7 +15,7 @@ import { useRateInfoParams } from 'common/hooks/useRateInfoParams'
 
 import * as styledEl from './styled'
 
-import { DEFAULT_TWAP_SLIPPAGE, orderDeadlines, defaultNumOfParts } from '../../const'
+import { DEFAULT_TWAP_SLIPPAGE, defaultNumOfParts, orderDeadlines } from '../../const'
 import { AmountParts } from '../../pure/AmountParts'
 import { DeadlineSelector } from '../../pure/DeadlineSelector'
 import { partsStateAtom } from '../../state/partsStateAtom'
@@ -37,7 +34,7 @@ export function TwapFormWidget() {
 
   const { inputCurrencyAmount, outputCurrencyAmount } = useAdvancedOrdersDerivedState()
   const { inputCurrencyAmount: rawInputCurrencyAmount } = useAdvancedOrdersRawState()
-  const updateRawState = useUpdateAdvancedOrdersRawState()
+  const { updateState } = useTradeState()
 
   const partsState = useAtomValue(partsStateAtom)
   const timeInterval = useAtomValue(twapTimeIntervalAtom)
@@ -58,8 +55,8 @@ export function TwapFormWidget() {
 
   // Reset output amount when num of parts or input amount are changed
   useEffect(() => {
-    updateRawState({ outputCurrencyAmount: null })
-  }, [updateRawState, numberOfPartsValue, rawInputCurrencyAmount])
+    updateState?.({ outputCurrencyAmount: null })
+  }, [updateState, numberOfPartsValue, rawInputCurrencyAmount])
 
   return (
     <>
diff --git a/src/modules/twap/pure/ConfirmDetailsItem/index.tsx b/src/modules/twap/pure/ConfirmDetailsItem/index.tsx
new file mode 100644
index 0000000000..b8cbd8a3d1
--- /dev/null
+++ b/src/modules/twap/pure/ConfirmDetailsItem/index.tsx
@@ -0,0 +1,48 @@
+import { ReactNode } from 'react'
+
+import { CornerDownRight } from 'react-feather'
+
+import { RowFixed } from 'legacy/components/Row'
+import { MouseoverTooltipContent } from 'legacy/components/Tooltip'
+
+import { TextWrapper } from 'modules/swap/pure/Row/styled'
+import { StyledInfoIcon } from 'modules/swap/pure/styled'
+
+import { Wrapper, Row, Content } from './styled'
+
+type Props = {
+  children: ReactNode
+  label?: string
+  tooltip?: string
+  withArrow?: boolean
+  fiatAmount?: string
+}
+
+export function ConfirmDetailsItem(props: Props) {
+  const { children, label, tooltip, withArrow = true } = props
+
+  return (
+    <Wrapper>
+      {withArrow && <CornerDownRight size={16} />}
+
+      {label ? (
+        <>
+          <Row>
+            <RowFixed>
+              {label && <TextWrapper>{label}</TextWrapper>}
+              {tooltip && (
+                <MouseoverTooltipContent content={tooltip} wrap>
+                  <StyledInfoIcon size={16} />
+                </MouseoverTooltipContent>
+              )}
+            </RowFixed>
+
+            <Content>{children}</Content>
+          </Row>
+        </>
+      ) : (
+        children
+      )}
+    </Wrapper>
+  )
+}
diff --git a/src/modules/twap/pure/ConfirmDetailsItem/styled.ts b/src/modules/twap/pure/ConfirmDetailsItem/styled.ts
new file mode 100644
index 0000000000..4de79e3556
--- /dev/null
+++ b/src/modules/twap/pure/ConfirmDetailsItem/styled.ts
@@ -0,0 +1,23 @@
+import styled from 'styled-components/macro'
+
+import { StyledRowBetween } from 'modules/swap/pure/Row/styled'
+
+export const Wrapper = styled.div`
+  display: flex;
+  align-items: center;
+
+  > svg:first-child {
+    margin-right: 5px;
+    color: ${({ theme }) => theme.text1};
+  }
+`
+
+export const Row = styled(StyledRowBetween)`
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+`
+
+export const Content = styled.div`
+  margin-left: auto;
+`
diff --git a/src/modules/twap/state/twapOrderAtom.ts b/src/modules/twap/state/twapOrderAtom.ts
index 9ca983f16c..fa72d1e52b 100644
--- a/src/modules/twap/state/twapOrderAtom.ts
+++ b/src/modules/twap/state/twapOrderAtom.ts
@@ -1,12 +1,11 @@
 import { atom } from 'jotai'
 
-import { CurrencyAmount, Percent, Token } from '@uniswap/sdk-core'
+import { CurrencyAmount, Token } from '@uniswap/sdk-core'
 
-import { twapOrdersSettingsAtom } from './twapOrdersSettingsAtom'
+import { twapOrderSlippage, twapOrdersSettingsAtom } from './twapOrdersSettingsAtom'
 
 import { advancedOrdersDerivedStateAtom } from '../../advancedOrders'
 import { walletInfoAtom } from '../../wallet/api/state'
-import { DEFAULT_TWAP_SLIPPAGE } from '../const'
 import { TWAPOrder } from '../types'
 import { customDeadlineToSeconds } from '../utils/deadlinePartsDisplay'
 
@@ -19,17 +18,13 @@ export const twapTimeIntervalAtom = atom<number>((get) => {
 
 export const twapOrderAtom = atom<TWAPOrder | null>((get) => {
   const { account } = get(walletInfoAtom)
-  const { numberOfPartsValue, slippageValue } = get(twapOrdersSettingsAtom)
+  const { numberOfPartsValue } = get(twapOrdersSettingsAtom)
   const timeInterval = get(twapTimeIntervalAtom)
   const { inputCurrencyAmount, outputCurrencyAmount, recipient } = get(advancedOrdersDerivedStateAtom)
+  const slippage = get(twapOrderSlippage)
 
   if (!inputCurrencyAmount || !outputCurrencyAmount || !account) return null
 
-  const slippage =
-    slippageValue != null
-      ? // Multiplying on 100 to allow decimals values (e.g 0.05)
-        new Percent(slippageValue * 100, 10000)
-      : DEFAULT_TWAP_SLIPPAGE
   const slippageAmount = outputCurrencyAmount.multiply(slippage)
   const buyAmountWithSlippage = outputCurrencyAmount.subtract(slippageAmount)
 
diff --git a/src/modules/twap/state/twapOrdersSettingsAtom.ts b/src/modules/twap/state/twapOrdersSettingsAtom.ts
index db2c3411ea..6693c56aaf 100644
--- a/src/modules/twap/state/twapOrdersSettingsAtom.ts
+++ b/src/modules/twap/state/twapOrdersSettingsAtom.ts
@@ -1,9 +1,11 @@
 import { atom } from 'jotai'
 import { atomWithStorage } from 'jotai/utils'
 
+import { Percent } from '@uniswap/sdk-core'
+
 import { Milliseconds } from 'types'
 
-import { defaultNumOfParts, defaultOrderDeadline } from '../const'
+import { DEFAULT_TWAP_SLIPPAGE, defaultNumOfParts, defaultOrderDeadline } from '../const'
 
 export interface TwapOrdersDeadline {
   readonly isCustomDeadline: boolean
@@ -46,3 +48,14 @@ export const updateTwapOrdersSettingsAtom = atom(null, (get, set, nextState: Par
     return { ...prevState, ...nextState }
   })
 })
+
+export const twapOrderSlippage = atom<Percent>((get) => {
+  const { slippageValue } = get(twapOrdersSettingsAtom)
+  const slippage =
+    slippageValue != null
+      ? // Multiplying on 100 to allow decimals values (e.g 0.05)
+        new Percent(slippageValue * 100, 10000)
+      : DEFAULT_TWAP_SLIPPAGE
+
+  return slippage
+})

From ee9946027b5b20953a4ebae576673d134e2ae32c Mon Sep 17 00:00:00 2001
From: Leandro <alfetopito@users.noreply.github.com>
Date: Mon, 12 Jun 2023 03:47:26 -0700
Subject: [PATCH 11/67] feat(twap): twap review order - pt2 - refactor
 container (#2630)

* refactor: move ConfirmDetailsItem to trade/pure

* refactor: move twap/containers/TwapConfirmDetails to trade/containers/TradeBasicConfirmDetails

* refactor: move slippage up to TwapConfirmModal

* refactor: remove redundant variable
---
 .../TradeBasicConfirmDetails}/LimitPriceRow.tsx   |  2 +-
 .../TradeBasicConfirmDetails}/MinReceivedRow.tsx  |  2 +-
 .../TradeBasicConfirmDetails}/SlippageRow.tsx     |  2 +-
 .../TradeBasicConfirmDetails}/index.tsx           | 15 ++++++---------
 .../TradeBasicConfirmDetails}/styled.ts           |  0
 .../pure/ConfirmDetailsItem/index.tsx             |  0
 .../pure/ConfirmDetailsItem/styled.ts             |  0
 .../twap/containers/TwapConfirmModal/index.tsx    |  8 ++++++--
 src/modules/twap/state/twapOrdersSettingsAtom.ts  | 10 ++++------
 9 files changed, 19 insertions(+), 20 deletions(-)
 rename src/modules/{twap/containers/TwapConfirmDetails => trade/containers/TradeBasicConfirmDetails}/LimitPriceRow.tsx (92%)
 rename src/modules/{twap/containers/TwapConfirmDetails => trade/containers/TradeBasicConfirmDetails}/MinReceivedRow.tsx (90%)
 rename src/modules/{twap/containers/TwapConfirmDetails => trade/containers/TradeBasicConfirmDetails}/SlippageRow.tsx (83%)
 rename src/modules/{twap/containers/TwapConfirmDetails => trade/containers/TradeBasicConfirmDetails}/index.tsx (85%)
 rename src/modules/{twap/containers/TwapConfirmDetails => trade/containers/TradeBasicConfirmDetails}/styled.ts (100%)
 rename src/modules/{twap => trade}/pure/ConfirmDetailsItem/index.tsx (100%)
 rename src/modules/{twap => trade}/pure/ConfirmDetailsItem/styled.ts (100%)

diff --git a/src/modules/twap/containers/TwapConfirmDetails/LimitPriceRow.tsx b/src/modules/trade/containers/TradeBasicConfirmDetails/LimitPriceRow.tsx
similarity index 92%
rename from src/modules/twap/containers/TwapConfirmDetails/LimitPriceRow.tsx
rename to src/modules/trade/containers/TradeBasicConfirmDetails/LimitPriceRow.tsx
index c3379880ba..11a28bf553 100644
--- a/src/modules/twap/containers/TwapConfirmDetails/LimitPriceRow.tsx
+++ b/src/modules/trade/containers/TradeBasicConfirmDetails/LimitPriceRow.tsx
@@ -4,7 +4,7 @@ import { Currency, Price } from '@uniswap/sdk-core'
 
 import { Nullish } from 'types'
 
-import { ConfirmDetailsItem } from 'modules/twap/pure/ConfirmDetailsItem'
+import { ConfirmDetailsItem } from 'modules/trade/pure/ConfirmDetailsItem'
 
 import { ExecutionPrice } from 'common/pure/ExecutionPrice'
 import { RateWrapper } from 'common/pure/RateInfo'
diff --git a/src/modules/twap/containers/TwapConfirmDetails/MinReceivedRow.tsx b/src/modules/trade/containers/TradeBasicConfirmDetails/MinReceivedRow.tsx
similarity index 90%
rename from src/modules/twap/containers/TwapConfirmDetails/MinReceivedRow.tsx
rename to src/modules/trade/containers/TradeBasicConfirmDetails/MinReceivedRow.tsx
index db9b51cd40..c85fa3e6f2 100644
--- a/src/modules/twap/containers/TwapConfirmDetails/MinReceivedRow.tsx
+++ b/src/modules/trade/containers/TradeBasicConfirmDetails/MinReceivedRow.tsx
@@ -2,7 +2,7 @@ import { Currency, CurrencyAmount } from '@uniswap/sdk-core'
 
 import { Nullish } from 'types'
 
-import { ConfirmDetailsItem } from 'modules/twap/pure/ConfirmDetailsItem'
+import { ConfirmDetailsItem } from 'modules/trade/pure/ConfirmDetailsItem'
 
 import { FiatAmount } from 'common/pure/FiatAmount'
 import { TokenAmount } from 'common/pure/TokenAmount'
diff --git a/src/modules/twap/containers/TwapConfirmDetails/SlippageRow.tsx b/src/modules/trade/containers/TradeBasicConfirmDetails/SlippageRow.tsx
similarity index 83%
rename from src/modules/twap/containers/TwapConfirmDetails/SlippageRow.tsx
rename to src/modules/trade/containers/TradeBasicConfirmDetails/SlippageRow.tsx
index ac9ba5ef6b..815f72f05f 100644
--- a/src/modules/twap/containers/TwapConfirmDetails/SlippageRow.tsx
+++ b/src/modules/trade/containers/TradeBasicConfirmDetails/SlippageRow.tsx
@@ -1,7 +1,7 @@
 import { Percent } from '@uniswap/sdk-core'
 
 import { RowSlippage } from 'modules/swap/containers/Row/RowSlippage'
-import { ConfirmDetailsItem } from 'modules/twap/pure/ConfirmDetailsItem'
+import { ConfirmDetailsItem } from 'modules/trade/pure/ConfirmDetailsItem'
 
 export type SlippageRowProps = {
   slippage: Percent
diff --git a/src/modules/twap/containers/TwapConfirmDetails/index.tsx b/src/modules/trade/containers/TradeBasicConfirmDetails/index.tsx
similarity index 85%
rename from src/modules/twap/containers/TwapConfirmDetails/index.tsx
rename to src/modules/trade/containers/TradeBasicConfirmDetails/index.tsx
index 0dc12bb9f0..bd618b9947 100644
--- a/src/modules/twap/containers/TwapConfirmDetails/index.tsx
+++ b/src/modules/trade/containers/TradeBasicConfirmDetails/index.tsx
@@ -1,4 +1,3 @@
-import { useAtomValue } from 'jotai'
 import { Dispatch, SetStateAction, useMemo } from 'react'
 
 import { Currency, CurrencyAmount, Percent } from '@uniswap/sdk-core'
@@ -8,8 +7,6 @@ import { Nullish } from 'types'
 import { ONE_HUNDRED_PERCENT } from 'legacy/constants/misc'
 import { useHigherUSDValue } from 'legacy/hooks/useStablecoinPrice'
 
-import { twapOrderSlippage } from 'modules/twap/state/twapOrdersSettingsAtom'
-
 import { usePrice } from 'common/hooks/usePrice'
 import { useRateInfoParams } from 'common/hooks/useRateInfoParams'
 import { CurrencyPreviewInfo } from 'common/pure/CurrencyAmountPreview'
@@ -23,18 +20,18 @@ type Props = {
   inputCurrencyInfo: CurrencyPreviewInfo
   outputCurrencyInfo: CurrencyPreviewInfo
   isInvertedState: [boolean, Dispatch<SetStateAction<boolean>>]
+  slippage: Percent
 }
 
-export function TwapConfirmDetails(props: Props) {
-  const { inputCurrencyInfo, outputCurrencyInfo, isInvertedState } = props
+export function TradeBasicConfirmDetails(props: Props) {
+  const { inputCurrencyInfo, outputCurrencyInfo, isInvertedState, slippage } = props
 
   const rateInfoParams = useRateInfoParams(inputCurrencyInfo.amount, outputCurrencyInfo.amount)
-  const allowedSlippage = useAtomValue(twapOrderSlippage)
 
   // This is the minimum per part
   const minReceivedAmountPerPart = useMemo(
-    () => getSlippageAdjustedBuyAmount(outputCurrencyInfo.amount, allowedSlippage),
-    [allowedSlippage, outputCurrencyInfo.amount]
+    () => getSlippageAdjustedBuyAmount(outputCurrencyInfo.amount, slippage),
+    [slippage, outputCurrencyInfo.amount]
   )
   const minReceivedUsdAmount = useHigherUSDValue(minReceivedAmountPerPart)
 
@@ -52,7 +49,7 @@ export function TwapConfirmDetails(props: Props) {
       />
 
       {/* Slippage */}
-      <SlippageRow slippage={allowedSlippage} />
+      <SlippageRow slippage={slippage} />
 
       {/* Limit Price */}
       <LimitPriceRow price={limitPrice} isInvertedState={isInvertedState} />
diff --git a/src/modules/twap/containers/TwapConfirmDetails/styled.ts b/src/modules/trade/containers/TradeBasicConfirmDetails/styled.ts
similarity index 100%
rename from src/modules/twap/containers/TwapConfirmDetails/styled.ts
rename to src/modules/trade/containers/TradeBasicConfirmDetails/styled.ts
diff --git a/src/modules/twap/pure/ConfirmDetailsItem/index.tsx b/src/modules/trade/pure/ConfirmDetailsItem/index.tsx
similarity index 100%
rename from src/modules/twap/pure/ConfirmDetailsItem/index.tsx
rename to src/modules/trade/pure/ConfirmDetailsItem/index.tsx
diff --git a/src/modules/twap/pure/ConfirmDetailsItem/styled.ts b/src/modules/trade/pure/ConfirmDetailsItem/styled.ts
similarity index 100%
rename from src/modules/twap/pure/ConfirmDetailsItem/styled.ts
rename to src/modules/trade/pure/ConfirmDetailsItem/styled.ts
diff --git a/src/modules/twap/containers/TwapConfirmModal/index.tsx b/src/modules/twap/containers/TwapConfirmModal/index.tsx
index 538e773f1d..b38eb6d924 100644
--- a/src/modules/twap/containers/TwapConfirmModal/index.tsx
+++ b/src/modules/twap/containers/TwapConfirmModal/index.tsx
@@ -1,10 +1,12 @@
+import { useAtomValue } from 'jotai'
 import { useState } from 'react'
 
 import { useAdvancedOrdersDerivedState } from 'modules/advancedOrders'
 import { TradeConfirmation, TradeConfirmModal, useTradeConfirmActions } from 'modules/trade'
+import { TradeBasicConfirmDetails } from 'modules/trade/containers/TradeBasicConfirmDetails'
 
 import { useCreateTwapOrder } from '../../hooks/useCreateTwapOrder'
-import { TwapConfirmDetails } from '../TwapConfirmDetails'
+import { twapOrderSlippage } from '../../state/twapOrdersSettingsAtom'
 
 export function TwapConfirmModal() {
   const {
@@ -15,6 +17,7 @@ export function TwapConfirmModal() {
     outputCurrencyFiatAmount,
     outputCurrencyBalance,
   } = useAdvancedOrdersDerivedState()
+  const slippage = useAtomValue(twapOrderSlippage)
 
   const tradeConfirmActions = useTradeConfirmActions()
   const createTwapOrder = useCreateTwapOrder()
@@ -58,10 +61,11 @@ export function TwapConfirmModal() {
       >
         <>
           <>{/*TODO: display details*/}</>
-          <TwapConfirmDetails
+          <TradeBasicConfirmDetails
             inputCurrencyInfo={inputCurrencyInfo}
             outputCurrencyInfo={outputCurrencyInfo}
             isInvertedState={isInvertedState}
+            slippage={slippage}
           />
         </>
       </TradeConfirmation>
diff --git a/src/modules/twap/state/twapOrdersSettingsAtom.ts b/src/modules/twap/state/twapOrdersSettingsAtom.ts
index 6693c56aaf..1faeae10ef 100644
--- a/src/modules/twap/state/twapOrdersSettingsAtom.ts
+++ b/src/modules/twap/state/twapOrdersSettingsAtom.ts
@@ -51,11 +51,9 @@ export const updateTwapOrdersSettingsAtom = atom(null, (get, set, nextState: Par
 
 export const twapOrderSlippage = atom<Percent>((get) => {
   const { slippageValue } = get(twapOrdersSettingsAtom)
-  const slippage =
-    slippageValue != null
-      ? // Multiplying on 100 to allow decimals values (e.g 0.05)
-        new Percent(slippageValue * 100, 10000)
-      : DEFAULT_TWAP_SLIPPAGE
 
-  return slippage
+  return slippageValue != null
+    ? // Multiplying on 100 to allow decimals values (e.g 0.05)
+      new Percent(slippageValue * 100, 10000)
+    : DEFAULT_TWAP_SLIPPAGE
 })

From 4165c5a56c0d0ed6ea1ca3ee101c4e31f45e4379 Mon Sep 17 00:00:00 2001
From: Leandro <alfetopito@users.noreply.github.com>
Date: Tue, 13 Jun 2023 02:23:04 -0700
Subject: [PATCH 12/67] feat(twap): twap review order - pt3 - twap fields
 (#2631)

* refactor: moved move logic out of TradeBasicConfirmDetails

* refactor: use Nullish on useStablecoinPrice hooks

* refactor: extract component ReviewOrderModalAmountRow

* feat: add prop to ReviewOrderModalAmountRow

* refactor: rename usdAmount to fiatAmount

* feat: add TwapConfirmDetails

* refactor: use buyAmount with slippage from state

* chore: remove comment regarding order amount

* refactor: remove MinReceivedRow component in favor of ReviewOrderModalAmountRow
---
 src/legacy/hooks/useStablecoinPrice/index.ts  | 14 +++---
 .../MinReceivedRow.tsx                        | 29 ------------
 .../TradeBasicConfirmDetails/index.tsx        | 42 +++++++----------
 .../trade/pure/ConfirmDetailsItem/index.tsx   |  4 +-
 .../pure/ReviewOrderModalAmountRow/index.tsx  | 39 +++++++++++++++
 .../TwapConfirmModal/TwapConfirmDetails.tsx   | 47 +++++++++++++++++++
 .../containers/TwapConfirmModal/index.tsx     | 24 ++++++++--
 7 files changed, 133 insertions(+), 66 deletions(-)
 delete mode 100644 src/modules/trade/containers/TradeBasicConfirmDetails/MinReceivedRow.tsx
 create mode 100644 src/modules/trade/pure/ReviewOrderModalAmountRow/index.tsx
 create mode 100644 src/modules/twap/containers/TwapConfirmModal/TwapConfirmDetails.tsx

diff --git a/src/legacy/hooks/useStablecoinPrice/index.ts b/src/legacy/hooks/useStablecoinPrice/index.ts
index f495fcd721..5d9832c857 100644
--- a/src/legacy/hooks/useStablecoinPrice/index.ts
+++ b/src/legacy/hooks/useStablecoinPrice/index.ts
@@ -1,10 +1,10 @@
 import { useEffect, useMemo, useRef, useState } from 'react'
 
-import { OrderKind } from '@cowprotocol/cow-sdk'
-import { SupportedChainId } from '@cowprotocol/cow-sdk'
-import { Currency, CurrencyAmount, Price, Token /*, TradeType*/ } from '@uniswap/sdk-core'
+import { OrderKind, SupportedChainId } from '@cowprotocol/cow-sdk'
+import { Currency, CurrencyAmount, Price, Token } from '@uniswap/sdk-core'
 
 import { unstable_batchedUpdates as batchedUpdate } from 'react-dom'
+import { Nullish } from 'types'
 
 import { DEFAULT_NETWORK_FOR_LISTS } from 'legacy/constants/lists'
 import { USDC, USDC_MAINNET } from 'legacy/constants/tokens'
@@ -122,7 +122,7 @@ export default function useCowUsdPrice(currency?: Currency) {
 }
 
 interface GetPriceQuoteParams {
-  currencyAmount?: CurrencyAmount<Currency>
+  currencyAmount: Nullish<CurrencyAmount<Currency>>
   error: Error | null
   price: Price<Token, Currency> | null
 }
@@ -144,7 +144,7 @@ function useGetPriceQuote({ price, error, currencyAmount }: GetPriceQuoteParams)
  * Returns the price in USDC of the input currency from price APIs
  * @param currencyAmount currency to compute the USDC price of
  */
-export function useUSDCValue(currencyAmount?: CurrencyAmount<Currency>) {
+export function useUSDCValue(currencyAmount: Nullish<CurrencyAmount<Currency>>) {
   const usdcPrice = useCowUsdPrice(currencyAmount?.currency)
 
   return useGetPriceQuote({ ...usdcPrice, currencyAmount })
@@ -228,13 +228,13 @@ export function useCoingeckoUsdPrice(currency?: Currency) {
   return { price, error }
 }
 
-export function useCoingeckoUsdValue(currencyAmount: CurrencyAmount<Currency> | undefined) {
+export function useCoingeckoUsdValue(currencyAmount: Nullish<CurrencyAmount<Currency>>) {
   const coingeckoUsdPrice = useCoingeckoUsdPrice(currencyAmount?.currency)
 
   return useGetPriceQuote({ ...coingeckoUsdPrice, currencyAmount })
 }
 
-export function useHigherUSDValue(currencyAmount: CurrencyAmount<Currency> | undefined) {
+export function useHigherUSDValue(currencyAmount: Nullish<CurrencyAmount<Currency>>) {
   const isWrapOrUnwrap = useIsWrapOrUnwrap()
   const checkedCurrencyAmount = isWrapOrUnwrap ? undefined : currencyAmount
   // if iswrap or unwrap use undefined values to not run expensive calculation
diff --git a/src/modules/trade/containers/TradeBasicConfirmDetails/MinReceivedRow.tsx b/src/modules/trade/containers/TradeBasicConfirmDetails/MinReceivedRow.tsx
deleted file mode 100644
index c85fa3e6f2..0000000000
--- a/src/modules/trade/containers/TradeBasicConfirmDetails/MinReceivedRow.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import { Currency, CurrencyAmount } from '@uniswap/sdk-core'
-
-import { Nullish } from 'types'
-
-import { ConfirmDetailsItem } from 'modules/trade/pure/ConfirmDetailsItem'
-
-import { FiatAmount } from 'common/pure/FiatAmount'
-import { TokenAmount } from 'common/pure/TokenAmount'
-
-type Props = {
-  amount: Nullish<CurrencyAmount<Currency>>
-  usdAmount: Nullish<CurrencyAmount<Currency>>
-}
-
-export function MinReceivedRow(props: Props) {
-  const { amount, usdAmount } = props
-
-  return (
-    <ConfirmDetailsItem tooltip="TODO: Min received tooltip" label="Min received (incl. fee)">
-      <TokenAmount amount={amount} defaultValue="-" tokenSymbol={amount?.currency} />
-      {usdAmount && (
-        <i>
-          &nbsp;(
-          <FiatAmount amount={usdAmount} />)
-        </i>
-      )}
-    </ConfirmDetailsItem>
-  )
-}
diff --git a/src/modules/trade/containers/TradeBasicConfirmDetails/index.tsx b/src/modules/trade/containers/TradeBasicConfirmDetails/index.tsx
index bd618b9947..1bd92d42a3 100644
--- a/src/modules/trade/containers/TradeBasicConfirmDetails/index.tsx
+++ b/src/modules/trade/containers/TradeBasicConfirmDetails/index.tsx
@@ -1,42 +1,36 @@
-import { Dispatch, SetStateAction, useMemo } from 'react'
+import { Dispatch, SetStateAction } from 'react'
 
 import { Currency, CurrencyAmount, Percent } from '@uniswap/sdk-core'
 
 import { Nullish } from 'types'
 
-import { ONE_HUNDRED_PERCENT } from 'legacy/constants/misc'
 import { useHigherUSDValue } from 'legacy/hooks/useStablecoinPrice'
 
 import { usePrice } from 'common/hooks/usePrice'
-import { useRateInfoParams } from 'common/hooks/useRateInfoParams'
-import { CurrencyPreviewInfo } from 'common/pure/CurrencyAmountPreview'
+import { RateInfoParams } from 'common/pure/RateInfo'
 
 import { LimitPriceRow } from './LimitPriceRow'
-import { MinReceivedRow } from './MinReceivedRow'
 import { SlippageRow } from './SlippageRow'
 import * as styledEl from './styled'
 
+import { ReviewOrderModalAmountRow } from '../../pure/ReviewOrderModalAmountRow'
+
 type Props = {
-  inputCurrencyInfo: CurrencyPreviewInfo
-  outputCurrencyInfo: CurrencyPreviewInfo
+  rateInfoParams: RateInfoParams
+  // TODO: Add maxSendAmount when using component in swap/limit BUY orders
+  minReceiveAmount: Nullish<CurrencyAmount<Currency>>
   isInvertedState: [boolean, Dispatch<SetStateAction<boolean>>]
   slippage: Percent
 }
 
 export function TradeBasicConfirmDetails(props: Props) {
-  const { inputCurrencyInfo, outputCurrencyInfo, isInvertedState, slippage } = props
-
-  const rateInfoParams = useRateInfoParams(inputCurrencyInfo.amount, outputCurrencyInfo.amount)
+  const { rateInfoParams, minReceiveAmount, isInvertedState, slippage } = props
+  const { inputCurrencyAmount } = rateInfoParams
 
-  // This is the minimum per part
-  const minReceivedAmountPerPart = useMemo(
-    () => getSlippageAdjustedBuyAmount(outputCurrencyInfo.amount, slippage),
-    [slippage, outputCurrencyInfo.amount]
-  )
-  const minReceivedUsdAmount = useHigherUSDValue(minReceivedAmountPerPart)
+  const minReceivedUsdAmount = useHigherUSDValue(minReceiveAmount)
 
   // Limit price is the same for all parts
-  const limitPrice = usePrice(inputCurrencyInfo.amount, minReceivedAmountPerPart)
+  const limitPrice = usePrice(inputCurrencyAmount, minReceiveAmount)
 
   return (
     <styledEl.Wrapper>
@@ -55,14 +49,12 @@ export function TradeBasicConfirmDetails(props: Props) {
       <LimitPriceRow price={limitPrice} isInvertedState={isInvertedState} />
 
       {/* Min received */}
-      <MinReceivedRow amount={minReceivedAmountPerPart} usdAmount={minReceivedUsdAmount} />
+      <ReviewOrderModalAmountRow
+        amount={minReceiveAmount}
+        fiatAmount={minReceivedUsdAmount}
+        tooltip="TODO: Min received tooltip"
+        label="Min received (incl. fee)"
+      />
     </styledEl.Wrapper>
   )
 }
-
-function getSlippageAdjustedBuyAmount(
-  buyAmount: Nullish<CurrencyAmount<Currency>>,
-  slippage: Percent
-): CurrencyAmount<Currency> | undefined {
-  return buyAmount?.multiply(ONE_HUNDRED_PERCENT.subtract(slippage))
-}
diff --git a/src/modules/trade/pure/ConfirmDetailsItem/index.tsx b/src/modules/trade/pure/ConfirmDetailsItem/index.tsx
index b8cbd8a3d1..6e58e83278 100644
--- a/src/modules/trade/pure/ConfirmDetailsItem/index.tsx
+++ b/src/modules/trade/pure/ConfirmDetailsItem/index.tsx
@@ -8,12 +8,12 @@ import { MouseoverTooltipContent } from 'legacy/components/Tooltip'
 import { TextWrapper } from 'modules/swap/pure/Row/styled'
 import { StyledInfoIcon } from 'modules/swap/pure/styled'
 
-import { Wrapper, Row, Content } from './styled'
+import { Content, Row, Wrapper } from './styled'
 
 type Props = {
   children: ReactNode
   label?: string
-  tooltip?: string
+  tooltip?: ReactNode
   withArrow?: boolean
   fiatAmount?: string
 }
diff --git a/src/modules/trade/pure/ReviewOrderModalAmountRow/index.tsx b/src/modules/trade/pure/ReviewOrderModalAmountRow/index.tsx
new file mode 100644
index 0000000000..08d82fe24f
--- /dev/null
+++ b/src/modules/trade/pure/ReviewOrderModalAmountRow/index.tsx
@@ -0,0 +1,39 @@
+import { ReactNode } from 'react'
+
+import { Currency, CurrencyAmount } from '@uniswap/sdk-core'
+
+import { Nullish } from 'types'
+
+import { FiatAmount } from 'common/pure/FiatAmount'
+import { TokenAmount } from 'common/pure/TokenAmount'
+
+import { ConfirmDetailsItem } from '../ConfirmDetailsItem'
+
+export type ReviewOrderAmountRowProps = {
+  amount: Nullish<CurrencyAmount<Currency>>
+  fiatAmount?: Nullish<CurrencyAmount<Currency>>
+  tooltip?: ReactNode
+  label: string
+  isAmountAccurate?: boolean
+}
+
+export function ReviewOrderModalAmountRow({
+  amount,
+  fiatAmount,
+  tooltip,
+  label,
+  isAmountAccurate = true,
+}: ReviewOrderAmountRowProps) {
+  return (
+    <ConfirmDetailsItem tooltip={tooltip} label={label}>
+      {!isAmountAccurate && '≈ '}
+      <TokenAmount amount={amount} defaultValue="-" tokenSymbol={amount?.currency} />
+      {fiatAmount && (
+        <i>
+          &nbsp;(
+          <FiatAmount amount={fiatAmount} />)
+        </i>
+      )}
+    </ConfirmDetailsItem>
+  )
+}
diff --git a/src/modules/twap/containers/TwapConfirmModal/TwapConfirmDetails.tsx b/src/modules/twap/containers/TwapConfirmModal/TwapConfirmDetails.tsx
new file mode 100644
index 0000000000..d1b410e2ae
--- /dev/null
+++ b/src/modules/twap/containers/TwapConfirmModal/TwapConfirmDetails.tsx
@@ -0,0 +1,47 @@
+import { ConfirmDetailsItem } from 'modules/trade/pure/ConfirmDetailsItem'
+import { ReviewOrderModalAmountRow } from 'modules/trade/pure/ReviewOrderModalAmountRow'
+
+import { PartsState } from '../../state/partsStateAtom'
+
+export type TwapConfirmDetailsProps = {
+  startTime: number | undefined
+  partDuration: number | undefined
+  partsState: PartsState
+}
+
+export function TwapConfirmDetails(_props: TwapConfirmDetailsProps) {
+  const { startTime, partDuration, partsState } = _props
+  const { numberOfPartsValue, inputPartAmount, inputFiatAmount, outputFiatAmount, outputPartAmount } = partsState
+
+  const partsSuffix = ` part (1/${numberOfPartsValue})`
+  const amountLabelSuffix = ' amount per' + partsSuffix
+
+  return (
+    <div>
+      <span>TWAP order split in {numberOfPartsValue} equal parts</span>
+      <ReviewOrderModalAmountRow
+        amount={inputPartAmount}
+        fiatAmount={inputFiatAmount}
+        tooltip="TODO: add tooltip"
+        label={'Sell' + amountLabelSuffix}
+      />
+      <ReviewOrderModalAmountRow
+        amount={outputPartAmount}
+        fiatAmount={outputFiatAmount}
+        tooltip="TODO: add tooltip"
+        label={'Buy' + amountLabelSuffix}
+        isAmountAccurate={false}
+      />
+      {/*TODO: implement logic for time fields*/}
+      <ConfirmDetailsItem tooltip="TODO: add tooltip" label={'Start time first' + partsSuffix} withArrow={false}>
+        {startTime}
+      </ConfirmDetailsItem>
+      <ConfirmDetailsItem tooltip="TODO: add tooltip" label="Part duration" withArrow={false}>
+        {partDuration}
+      </ConfirmDetailsItem>
+      <ConfirmDetailsItem tooltip="TODO: add tooltip" label="Total duration" withArrow={false}>
+        {partDuration}
+      </ConfirmDetailsItem>
+    </div>
+  )
+}
diff --git a/src/modules/twap/containers/TwapConfirmModal/index.tsx b/src/modules/twap/containers/TwapConfirmModal/index.tsx
index b38eb6d924..fa8f954fac 100644
--- a/src/modules/twap/containers/TwapConfirmModal/index.tsx
+++ b/src/modules/twap/containers/TwapConfirmModal/index.tsx
@@ -5,7 +5,13 @@ import { useAdvancedOrdersDerivedState } from 'modules/advancedOrders'
 import { TradeConfirmation, TradeConfirmModal, useTradeConfirmActions } from 'modules/trade'
 import { TradeBasicConfirmDetails } from 'modules/trade/containers/TradeBasicConfirmDetails'
 
+import { useRateInfoParams } from 'common/hooks/useRateInfoParams'
+
+import { TwapConfirmDetails } from './TwapConfirmDetails'
+
 import { useCreateTwapOrder } from '../../hooks/useCreateTwapOrder'
+import { partsStateAtom } from '../../state/partsStateAtom'
+import { twapOrderAtom } from '../../state/twapOrderAtom'
 import { twapOrderSlippage } from '../../state/twapOrdersSettingsAtom'
 
 export function TwapConfirmModal() {
@@ -17,7 +23,10 @@ export function TwapConfirmModal() {
     outputCurrencyFiatAmount,
     outputCurrencyBalance,
   } = useAdvancedOrdersDerivedState()
+  // TODO: there's some overlap with what's in each atom
+  const twapOrder = useAtomValue(twapOrderAtom)
   const slippage = useAtomValue(twapOrderSlippage)
+  const partsState = useAtomValue(partsStateAtom)
 
   const tradeConfirmActions = useTradeConfirmActions()
   const createTwapOrder = useCreateTwapOrder()
@@ -48,6 +57,11 @@ export function TwapConfirmModal() {
     label: 'Estimated receive amount',
   }
 
+  const rateInfoParams = useRateInfoParams(inputCurrencyInfo.amount, outputCurrencyInfo.amount)
+
+  // This already takes into account the full order
+  const minReceivedAmount = twapOrder?.buyAmount
+
   return (
     <TradeConfirmModal>
       <TradeConfirmation
@@ -60,13 +74,17 @@ export function TwapConfirmModal() {
         priceImpact={priceImpact}
       >
         <>
-          <>{/*TODO: display details*/}</>
           <TradeBasicConfirmDetails
-            inputCurrencyInfo={inputCurrencyInfo}
-            outputCurrencyInfo={outputCurrencyInfo}
+            rateInfoParams={rateInfoParams}
+            minReceiveAmount={minReceivedAmount}
             isInvertedState={isInvertedState}
             slippage={slippage}
           />
+          <TwapConfirmDetails
+            startTime={twapOrder?.startTime}
+            partDuration={twapOrder?.timeInterval}
+            partsState={partsState}
+          />
         </>
       </TradeConfirmation>
     </TradeConfirmModal>

From 45beb4322af0ab6f2c876abed72e7f32d6c9c5be Mon Sep 17 00:00:00 2001
From: Leandro <alfetopito@users.noreply.github.com>
Date: Tue, 13 Jun 2023 02:33:43 -0700
Subject: [PATCH 13/67] feat(favorite-tokens): add EURe as default on Gnosis
 Chain (#2647)

* feat: add EURe token instance

* refactor: remove alias ChainId

* feat: add EURe to gchain default tokens

Also remove duplicated WBTC from the list an re-order favourites
---
 src/legacy/constants/routing.ts |  7 ++++---
 src/legacy/constants/tokens.ts  | 15 +++++++++++----
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/legacy/constants/routing.ts b/src/legacy/constants/routing.ts
index ac37a31292..07369e0c80 100644
--- a/src/legacy/constants/routing.ts
+++ b/src/legacy/constants/routing.ts
@@ -8,6 +8,7 @@ import {
   COW,
   DAI,
   ETH2X_FLI,
+  EURE_GNOSIS_CHAIN,
   FEI,
   FRAX,
   FXS,
@@ -92,11 +93,11 @@ export const COMMON_BASES: ChainCurrencyList = {
   ],
   [SupportedChainId.GNOSIS_CHAIN]: [
     USDC_GNOSIS_CHAIN,
-    WBTC_GNOSIS_CHAIN,
     COW[SupportedChainId.GNOSIS_CHAIN],
-    WBTC_GNOSIS_CHAIN,
-    WETH_GNOSIS_CHAIN,
+    EURE_GNOSIS_CHAIN,
     WRAPPED_NATIVE_CURRENCY[SupportedChainId.GNOSIS_CHAIN],
+    WETH_GNOSIS_CHAIN,
+    WBTC_GNOSIS_CHAIN,
   ],
 }
 
diff --git a/src/legacy/constants/tokens.ts b/src/legacy/constants/tokens.ts
index 201952189b..c3f9d214a7 100644
--- a/src/legacy/constants/tokens.ts
+++ b/src/legacy/constants/tokens.ts
@@ -1,4 +1,3 @@
-import { SupportedChainId as ChainId } from '@cowprotocol/cow-sdk'
 import { SupportedChainId } from '@cowprotocol/cow-sdk'
 import { Currency, Ether, NativeCurrency, Token, WETH9 } from '@uniswap/sdk-core'
 
@@ -209,7 +208,7 @@ function getTrustImage(mainnetAddress: string): string {
   return `https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/${mainnetAddress}/logo.png`
 }
 
-const WETH_ADDRESS_MAINNET = WETH9[ChainId.MAINNET].address
+const WETH_ADDRESS_MAINNET = WETH9[SupportedChainId.MAINNET].address
 
 /**
  * vCow token
@@ -303,13 +302,21 @@ export const GNO: Record<SupportedChainId, Token> = {
   [SupportedChainId.GOERLI]: GNO_GOERLI,
 }
 
+export const EURE_GNOSIS_CHAIN = new Token(
+  SupportedChainId.GNOSIS_CHAIN,
+  '0xcb444e90d8198415266c6a2724b7900fb12fc56e',
+  18,
+  'EURe',
+  'Monerium EUR emoney'
+)
+
 export const ADDRESS_IMAGE_OVERRIDE = {
   // Goerli
   [DAI_GOERLI.address]: getTrustImage(DAI.address),
   [USDC_GOERLI.address]: getTrustImage(USDC_MAINNET.address),
   [USDT_GOERLI.address]: getTrustImage(USDT.address),
   [WBTC_GOERLI.address]: getTrustImage(WBTC.address),
-  [WETH9[ChainId.GOERLI].address]: getTrustImage(WETH_ADDRESS_MAINNET),
+  [WETH9[SupportedChainId.GOERLI].address]: getTrustImage(WETH_ADDRESS_MAINNET),
   [V_COW_TOKEN_GOERLI.address]: vCowLogo,
   [COW_TOKEN_GOERLI.address]: cowLogo,
   [GNO_GOERLI.address]: gnoLogo,
@@ -327,7 +334,7 @@ export const ADDRESS_IMAGE_OVERRIDE = {
   // Mainnet
   [V_COW_TOKEN_MAINNET.address]: vCowLogo,
   [COW_TOKEN_MAINNET.address]: cowLogo,
-  [WETH9[ChainId.MAINNET].address]: getTrustImage(WETH_ADDRESS_MAINNET),
+  [WETH9[SupportedChainId.MAINNET].address]: getTrustImage(WETH_ADDRESS_MAINNET),
 }
 
 /**

From 41b1204c84e10c26be11edf2c660872bb703dfce Mon Sep 17 00:00:00 2001
From: Alexandr Kazachenko <shoom3301@gmail.com>
Date: Tue, 13 Jun 2023 17:41:47 +0600
Subject: [PATCH 14/67] refactor: remove account/Affilate and its deps (#2621)

---
 src/legacy/hooks/useFetchProfile.ts           |  63 -----
 .../hooks/useParseReferralQueryParam.ts       |  37 ---
 src/legacy/hooks/useReferralLink.ts           |  32 ---
 src/legacy/state/affiliate/actions.ts         |  12 -
 src/legacy/state/affiliate/hooks.ts           |  28 ---
 src/legacy/state/affiliate/reducer.ts         |  36 ---
 src/legacy/state/affiliate/updater.tsx        |  64 -----
 src/pages/Account/AddressSelector.tsx         | 223 ------------------
 src/pages/Account/Affiliate.tsx               | 213 -----------------
 9 files changed, 708 deletions(-)
 delete mode 100644 src/legacy/hooks/useFetchProfile.ts
 delete mode 100644 src/legacy/hooks/useParseReferralQueryParam.ts
 delete mode 100644 src/legacy/hooks/useReferralLink.ts
 delete mode 100644 src/legacy/state/affiliate/actions.ts
 delete mode 100644 src/legacy/state/affiliate/hooks.ts
 delete mode 100644 src/legacy/state/affiliate/reducer.ts
 delete mode 100644 src/legacy/state/affiliate/updater.tsx
 delete mode 100644 src/pages/Account/AddressSelector.tsx
 delete mode 100644 src/pages/Account/Affiliate.tsx

diff --git a/src/legacy/hooks/useFetchProfile.ts b/src/legacy/hooks/useFetchProfile.ts
deleted file mode 100644
index 0c323ae661..0000000000
--- a/src/legacy/hooks/useFetchProfile.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-import { useEffect, useState } from 'react'
-
-import useIsWindowVisible from 'legacy/hooks/useIsWindowVisible'
-
-import { useWalletInfo } from 'modules/wallet'
-
-import { getProfileData } from 'api/gnosisProtocol'
-import { ProfileData } from 'api/gnosisProtocol/api'
-
-type FetchProfileState = {
-  profileData: ProfileData | null
-  error: string
-  isLoading: boolean
-}
-
-const emptyState: FetchProfileState = {
-  profileData: null,
-  error: '',
-  isLoading: false,
-}
-
-const FETCH_INTERVAL_IN_MINUTES = 5
-
-export default function useFetchProfile(): FetchProfileState {
-  const { account, chainId } = useWalletInfo()
-  const [profile, setProfile] = useState<FetchProfileState>(emptyState)
-  const isWindowVisible = useIsWindowVisible()
-
-  useEffect(() => {
-    if (!isWindowVisible) {
-      console.debug('[useFetchProfile] No need to fetch profile info')
-      return
-    }
-
-    async function fetchAndSetProfileData() {
-      console.debug('[useFetchProfile] Fetching profile info')
-      try {
-        if (chainId && account) {
-          setProfile((profile) => ({ ...profile, isLoading: true, error: '' }))
-          const profileData = await getProfileData(chainId, account)
-          setProfile((profile) => ({ ...profile, isLoading: false, profileData }))
-        } else {
-          setProfile(emptyState)
-        }
-      } catch (error: any) {
-        console.error(error)
-        setProfile((profile) => ({
-          ...profile,
-          isLoading: false,
-          error: 'There was an error while fetching the profile data',
-        }))
-      }
-    }
-
-    console.debug('[useFetchProfile] No need to fetch profile info')
-    const intervalId = setInterval(fetchAndSetProfileData, FETCH_INTERVAL_IN_MINUTES * 60_000)
-
-    fetchAndSetProfileData()
-    return () => clearInterval(intervalId)
-  }, [account, chainId, isWindowVisible])
-
-  return profile
-}
diff --git a/src/legacy/hooks/useParseReferralQueryParam.ts b/src/legacy/hooks/useParseReferralQueryParam.ts
deleted file mode 100644
index 3e1a9e3a32..0000000000
--- a/src/legacy/hooks/useParseReferralQueryParam.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { useMemo, useState } from 'react'
-
-import useENS from 'legacy/hooks/useENS'
-import useParsedQueryString from 'legacy/hooks/useParsedQueryString'
-import { REFERRAL_QUERY_PARAM } from 'legacy/hooks/useReferralLink'
-import { isAddress } from 'legacy/utils'
-
-type ReferralQueryValue = {
-  value: string
-  isValid: boolean
-} | null
-
-/**
- * Returns the parsed referral address from the query parameters if its a valid address
- */
-export default function useParseReferralQueryParam(): ReferralQueryValue {
-  const parsedQs = useParsedQueryString()
-  const referralAddress = parsedQs[REFERRAL_QUERY_PARAM] as string
-  const result = useENS(referralAddress)
-  const [loading, setLoading] = useState(isAddress(referralAddress) === false) // this is a hack to force a initial loading state to true in case of referralAddress is a ens name because the useENS hook returns loading as false when initialized
-
-  return useMemo(() => {
-    if (loading || result.loading || !referralAddress) {
-      if (result.loading) {
-        setLoading(false)
-      }
-      return null
-    }
-
-    if (result.address) {
-      return { value: result.address, isValid: true }
-    }
-
-    console.warn('Invalid referral address')
-    return { value: '', isValid: false }
-  }, [result.loading, result.address, referralAddress, loading])
-}
diff --git a/src/legacy/hooks/useReferralLink.ts b/src/legacy/hooks/useReferralLink.ts
deleted file mode 100644
index 8f01fbbd01..0000000000
--- a/src/legacy/hooks/useReferralLink.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { useWalletInfo } from 'modules/wallet'
-
-export const REFERRAL_QUERY_PARAM = 'referral'
-
-export type ReferralLink = {
-  link: string
-  prefix: string
-  address: string
-}
-
-export function getReferralLink(walletAddress: string): ReferralLink {
-  const prefix = `${window.location.origin}/#/?${REFERRAL_QUERY_PARAM}=`
-
-  return {
-    link: prefix + walletAddress,
-    prefix,
-    address: walletAddress,
-  }
-}
-
-/**
- * Returns the referral link with the connected wallet address
- */
-export default function useReferralLink(): ReferralLink | null {
-  const { account } = useWalletInfo()
-
-  if (account) {
-    return getReferralLink(account)
-  }
-
-  return null
-}
diff --git a/src/legacy/state/affiliate/actions.ts b/src/legacy/state/affiliate/actions.ts
deleted file mode 100644
index 97bac9de10..0000000000
--- a/src/legacy/state/affiliate/actions.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { createAction } from '@reduxjs/toolkit'
-
-export const updateReferralAddress = createAction<{
-  value: string
-  isValid: boolean
-} | null>('affiliate/updateReferralAddress')
-
-export const setReferralAddressActive = createAction<boolean>('affiliate/setReferralAddressActive')
-
-export const updateAddress = createAction<string>('affiliate/updateAddress')
-
-export const dismissNotification = createAction<string>('affiliate/dismissNotification')
diff --git a/src/legacy/state/affiliate/hooks.ts b/src/legacy/state/affiliate/hooks.ts
deleted file mode 100644
index b32054f398..0000000000
--- a/src/legacy/state/affiliate/hooks.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { useCallback } from 'react'
-
-import { setReferralAddressActive, updateReferralAddress } from 'legacy/state/affiliate/actions'
-import { useAppDispatch, useAppSelector } from 'legacy/state/hooks'
-
-export function useReferralAddress() {
-  return useAppSelector((state: any) => state.affiliate.referralAddress)
-}
-
-export function useAffiliateAddress() {
-  return useAppSelector((state: any) => state.affiliate.address)
-}
-
-export function useResetReferralAddress() {
-  const dispatch = useAppDispatch()
-
-  return useCallback(() => dispatch(updateReferralAddress(null)), [dispatch])
-}
-
-export function useSetReferralAddressActive() {
-  const dispatch = useAppDispatch()
-
-  return useCallback((isActive: boolean) => dispatch(setReferralAddressActive(isActive)), [dispatch])
-}
-
-export function useIsNotificationClosed(id?: string): boolean | null {
-  return useAppSelector((state: any) => (id ? state.affiliate.isNotificationClosed?.[id] ?? false : null))
-}
diff --git a/src/legacy/state/affiliate/reducer.ts b/src/legacy/state/affiliate/reducer.ts
deleted file mode 100644
index 027e7ac2c7..0000000000
--- a/src/legacy/state/affiliate/reducer.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { createReducer } from '@reduxjs/toolkit'
-
-import { dismissNotification, setReferralAddressActive, updateAddress, updateReferralAddress } from './actions'
-
-export interface AffiliateState {
-  referralAddress?: {
-    value: string
-    isValid: boolean
-    isActive?: boolean
-  }
-  isNotificationClosed?: {
-    [key: string]: boolean
-  }
-  address?: string // this can be an ENS name or an address
-}
-
-export const initialState: AffiliateState = {}
-
-export default createReducer(initialState, (builder) =>
-  builder
-    .addCase(updateReferralAddress, (state, action) => {
-      state.referralAddress = action.payload ? { ...state.referralAddress, ...action.payload } : undefined
-    })
-    .addCase(setReferralAddressActive, (state, action) => {
-      if (state.referralAddress) {
-        state.referralAddress.isActive = action.payload
-      }
-    })
-    .addCase(updateAddress, (state, action) => {
-      state.address = action.payload
-    })
-    .addCase(dismissNotification, (state, action) => {
-      state.isNotificationClosed = state.isNotificationClosed ?? {}
-      state.isNotificationClosed[action.payload] = true
-    })
-)
diff --git a/src/legacy/state/affiliate/updater.tsx b/src/legacy/state/affiliate/updater.tsx
deleted file mode 100644
index 3a42d48d58..0000000000
--- a/src/legacy/state/affiliate/updater.tsx
+++ /dev/null
@@ -1,64 +0,0 @@
-import { useCallback, useEffect } from 'react'
-
-import useParseReferralQueryParam from 'legacy/hooks/useParseReferralQueryParam'
-import { dismissNotification, updateReferralAddress } from 'legacy/state/affiliate/actions'
-import { useReferralAddress } from 'legacy/state/affiliate/hooks'
-import { useAppDispatch } from 'legacy/state/hooks'
-
-import { AffiliateState } from './reducer'
-
-export function ReferralLinkUpdater() {
-  const dispatch = useAppDispatch()
-  const referralAddressParam = useParseReferralQueryParam()
-  const referralAddress = useReferralAddress()
-
-  useEffect(() => {
-    if (!referralAddressParam && !referralAddress?.isValid) {
-      dispatch(updateReferralAddress(null))
-    } else if (referralAddressParam) {
-      dispatch(updateReferralAddress(referralAddressParam))
-    }
-  }, [referralAddressParam, referralAddress?.isValid, dispatch])
-
-  return null
-}
-
-const AFFILIATE_LS_KEY = 'redux_localstorage_simple_affiliate'
-
-// This handles cross tab state sync so the Affiliate banner is shown/hidden
-export function StorageUpdater() {
-  const dispatch = useAppDispatch()
-
-  const handler = useCallback(
-    (e: StorageEvent) => {
-      if (e.key === AFFILIATE_LS_KEY && e.newValue) {
-        const parsed = JSON.parse(e.newValue) as AffiliateState
-        for (const id in parsed.isNotificationClosed) {
-          dispatch(dismissNotification(id))
-        }
-
-        if (parsed.referralAddress) {
-          dispatch(updateReferralAddress(parsed.referralAddress))
-        }
-      }
-    },
-    [dispatch]
-  )
-
-  useEffect(() => {
-    window.addEventListener('storage', handler)
-
-    return () => window.removeEventListener('storage', handler)
-  }, [handler])
-
-  return null
-}
-
-export default function AffiliateUpdaters() {
-  return (
-    <>
-      <ReferralLinkUpdater />
-      <StorageUpdater />
-    </>
-  )
-}
diff --git a/src/pages/Account/AddressSelector.tsx b/src/pages/Account/AddressSelector.tsx
deleted file mode 100644
index f5624842ad..0000000000
--- a/src/pages/Account/AddressSelector.tsx
+++ /dev/null
@@ -1,223 +0,0 @@
-import { useCallback, useEffect, useRef, useState } from 'react'
-
-import { useWeb3React } from '@web3-react/core'
-
-import { Check, ChevronDown } from 'react-feather'
-import styled, { css } from 'styled-components/macro'
-
-import { useOnClickOutside } from 'legacy/hooks/useOnClickOutside'
-import { updateAddress } from 'legacy/state/affiliate/actions'
-import { useAffiliateAddress } from 'legacy/state/affiliate/hooks'
-import { useAppDispatch } from 'legacy/state/hooks'
-import { isAddress, shortenAddress } from 'legacy/utils'
-
-import { useWalletInfo } from 'modules/wallet'
-
-import { ensNames } from 'pages/Account/ens'
-
-type AddressSelectorProps = {
-  address: string
-}
-
-export default function AddressSelector(props: AddressSelectorProps) {
-  const { address } = props
-  const dispatch = useAppDispatch()
-  const selectedAddress = useAffiliateAddress()
-  const { provider } = useWeb3React()
-  const { chainId } = useWalletInfo()
-  const [open, setOpen] = useState(false)
-  const [items, setItems] = useState<string[]>([address])
-  const toggle = useCallback(() => setOpen((open) => !open), [])
-  const node = useRef<HTMLDivElement>(null)
-  useOnClickOutside(node, open ? toggle : undefined)
-
-  const tryShortenAddress = useCallback((item?: string) => {
-    if (!item) {
-      return item
-    }
-
-    try {
-      return shortenAddress(item)
-    } catch (error: any) {
-      return item
-    }
-  }, [])
-
-  const handleSelectItem = useCallback(
-    (item: string) => {
-      dispatch(updateAddress(item))
-      toggle()
-    },
-    [dispatch, toggle]
-  )
-
-  useEffect(() => {
-    if (!chainId) {
-      return
-    }
-
-    ensNames(chainId, address).then((response) => {
-      if ('error' in response) {
-        console.info(response.error)
-        setItems([address])
-        return
-      }
-      setItems([...response, address])
-    })
-  }, [address, chainId])
-
-  useEffect(() => {
-    // if the user switches accounts, reset the selected address
-    const switchedAccounts = isAddress(selectedAddress) && selectedAddress !== address
-    if (switchedAccounts || !selectedAddress) {
-      dispatch(updateAddress(address))
-      return
-    }
-
-    // the selected address is a ens name, verify that resolves to the correct address
-    const verify = async () => {
-      const resolvedAddress = await provider?.resolveName(selectedAddress)
-      if (resolvedAddress !== address) {
-        dispatch(updateAddress(address))
-      }
-    }
-
-    verify()
-  }, [selectedAddress, address, dispatch, provider])
-
-  return (
-    <>
-      {items.length === 1 ? (
-        <strong>{tryShortenAddress(address)}</strong>
-      ) : (
-        <Wrapper ref={node}>
-          <AddressInfo onClick={toggle}>
-            <span style={{ marginRight: '2px' }}>{tryShortenAddress(selectedAddress)}</span>
-            <ChevronDown size={16} style={{ marginTop: '2px' }} strokeWidth={2.5} />
-          </AddressInfo>
-          {open && (
-            <MenuFlyout>
-              {items.map((item) => (
-                <ButtonMenuItem key={item} $selected={item === ''} onClick={() => handleSelectItem(item)}>
-                  <GreenCheck size={16} strokeWidth={2.5} $visible={item === selectedAddress} />{' '}
-                  {tryShortenAddress(item)}
-                </ButtonMenuItem>
-              ))}
-            </MenuFlyout>
-          )}
-        </Wrapper>
-      )}
-    </>
-  )
-}
-
-const Wrapper = styled.div`
-  position: relative;
-  display: inline;
-  margin-right: 0.4rem;
-  ${({ theme }) => theme.mediaWidth.upToMedium`
-    justify-self: end;
-  `};
-
-  ${({ theme }) => theme.mediaWidth.upToSmall`
-    margin: 0 0.5rem 0 0;
-    width: initial;
-    text-overflow: ellipsis;
-    flex-shrink: 1;
-  `};
-`
-
-const MenuFlyout = styled.span`
-  background-color: ${({ theme }) => theme.bg4};
-  border: 1px solid ${({ theme }) => theme.bg0};
-
-  box-shadow: 0px 0px 1px rgba(0, 0, 0, 0.01), 0px 4px 8px rgba(0, 0, 0, 0.04), 0px 16px 24px rgba(0, 0, 0, 0.04),
-    0px 24px 32px rgba(0, 0, 0, 0.01);
-  border-radius: 12px;
-  padding: 0.3rem;
-  display: flex;
-  flex-direction: column;
-  font-size: 1rem;
-  position: absolute;
-  left: 0;
-  top: 1.75rem;
-  z-index: 100;
-  min-width: 350px;
-  ${({ theme }) => theme.mediaWidth.upToMedium`;
-    min-width: 145px
-  `};
-
-  > {
-    padding: 12px;
-  }
-`
-const MenuItem = css`
-  align-items: center;
-  background-color: transparent;
-  border-radius: 12px;
-  color: ${({ theme }) => theme.text2};
-  cursor: pointer;
-  display: flex;
-  flex: 1;
-  flex-direction: row;
-  font-size: 16px;
-  font-weight: 400;
-  justify-content: start;
-  :hover {
-    text-decoration: none;
-  }
-`
-
-export const AddressInfo = styled.button`
-  align-items: center;
-  background-color: ${({ theme }) => theme.bg4};
-  border-radius: 12px;
-  border: 1px solid ${({ theme }) => theme.bg0};
-  color: ${({ theme }) => theme.text1};
-  display: inline-flex;
-  flex-direction: row;
-  font-weight: 700;
-  font-size: 12px;
-  height: 100%;
-  margin: 0 0.4rem;
-  padding: 0.2rem 0.4rem;
-
-  :hover,
-  :focus {
-    cursor: pointer;
-    outline: none;
-    border: 1px solid ${({ theme }) => theme.bg3};
-  }
-`
-const ButtonMenuItem = styled.button<{ $selected?: boolean }>`
-  ${MenuItem}
-  cursor: ${({ $selected }) => ($selected ? 'initial' : 'pointer')};
-  border: none;
-  box-shadow: none;
-  color: ${({ theme, $selected }) => ($selected ? theme.text2 : theme.text1)};
-  background-color: ${({ theme, $selected }) => $selected && theme.primary1};
-  outline: none;
-  font-weight: ${({ $selected }) => ($selected ? '700' : '500')};
-  font-size: 12px;
-  text-transform: lowercase;
-  padding: 6px 10px 6px 5px;
-
-  ${({ $selected }) => $selected && `margin: 3px 0;`}
-
-  > ${AddressInfo} {
-    margin: 0 auto 0 8px;
-  }
-
-  &:hover {
-    color: ${({ theme, $selected }) => !$selected && theme.text1};
-    background: ${({ theme, $selected }) => !$selected && theme.bg4};
-  }
-
-  transition: background 0.13s ease-in-out;
-`
-
-const GreenCheck = styled(Check)<{ $visible: boolean }>`
-  margin-right: 5px;
-  color: ${({ theme }) => theme.success};
-  visibility: ${({ $visible }) => ($visible ? 'visible' : 'hidden')};
-`
diff --git a/src/pages/Account/Affiliate.tsx b/src/pages/Account/Affiliate.tsx
deleted file mode 100644
index 233e97fc6b..0000000000
--- a/src/pages/Account/Affiliate.tsx
+++ /dev/null
@@ -1,213 +0,0 @@
-import { SupportedChainId as ChainId } from '@cowprotocol/cow-sdk'
-
-import { RefreshCcw } from 'react-feather'
-
-import { Txt } from 'legacy/assets/styles/styled'
-import Copy from 'legacy/components/Copy/CopyMod'
-import NotificationBanner from 'legacy/components/NotificationBanner'
-import { MouseoverTooltipContent } from 'legacy/components/Tooltip'
-import useFetchProfile from 'legacy/hooks/useFetchProfile'
-import useReferralLink from 'legacy/hooks/useReferralLink'
-import useTimeAgo from 'legacy/hooks/useTimeAgo'
-import { useAffiliateAddress } from 'legacy/state/affiliate/hooks'
-import { shortenAddress } from 'legacy/utils'
-import { getExplorerAddressLink } from 'legacy/utils/explorer'
-
-import { SectionTitle } from 'modules/application/pure/Page'
-import { useWalletInfo, Web3Status } from 'modules/wallet'
-
-import { useHasOrders } from 'api/gnosisProtocol/hooks'
-import { HelpCircle } from 'common/pure/HelpCircle'
-
-import AddressSelector from './AddressSelector'
-import {
-  Wrapper,
-  GridWrap,
-  CardHead,
-  StyledContainer,
-  ExtLink,
-  ChildWrapper,
-  ItemTitle,
-  FlexWrap,
-  FlexCol,
-  Loader,
-  TimeFormatted,
-} from './styled'
-import { formatInt, formatDecimal } from './utils'
-
-const NotificationMessages = ({ error, chainId }: { error?: unknown; chainId: ChainId }) => (
-  <>
-    {error && (
-      <NotificationBanner isVisible level="error" canClose={false}>
-        There was an error loading your profile data. Please try again later.
-      </NotificationBanner>
-    )}
-    {chainId && chainId !== ChainId.MAINNET && (
-      <NotificationBanner isVisible level="info" canClose={false}>
-        Affiliate data is only available for Ethereum. Please change the network to see it.
-      </NotificationBanner>
-    )}
-  </>
-)
-
-export default function Affiliate() {
-  const referralLink = useReferralLink()
-  const { account, chainId = ChainId.MAINNET /* , error */ } = useWalletInfo()
-  const { profileData, isLoading } = useFetchProfile()
-  const lastUpdated = useTimeAgo(profileData?.lastUpdated)
-  const hasOrders = useHasOrders(account)
-  const selectedAddress = useAffiliateAddress()
-
-  const isTradesTooltipVisible = account && chainId === ChainId.MAINNET && !!profileData?.totalTrades
-
-  return (
-    <Wrapper>
-      <GridWrap>
-        <CardHead>
-          <SectionTitle>Affiliate Program</SectionTitle>
-          {account && (
-            <Loader isLoading={isLoading}>
-              <StyledContainer>
-                <Txt gap={4}>
-                  <RefreshCcw size={16} />
-                  <Txt gap={4}>Last updated: </Txt>
-                  {!lastUpdated ? (
-                    '-'
-                  ) : (
-                    <MouseoverTooltipContent content={<TimeFormatted date={profileData?.lastUpdated} />} wrap>
-                      <Txt fontSize={14} fontWeight={600}>
-                        {lastUpdated}
-                      </Txt>
-                    </MouseoverTooltipContent>
-                  )}
-                  <MouseoverTooltipContent content="Data is updated on the background periodically." wrap>
-                    <HelpCircle size={14} />
-                  </MouseoverTooltipContent>
-                </Txt>
-                {hasOrders && (
-                  <ExtLink href={getExplorerAddressLink(chainId, account)}>
-                    <Txt fontSize={14}>View all orders ↗</Txt>
-                  </ExtLink>
-                )}
-              </StyledContainer>
-            </Loader>
-          )}
-        </CardHead>
-
-        <NotificationMessages /* error={error} */ chainId={chainId} />
-
-        <ChildWrapper>
-          <Txt fontSize={16}>
-            <strong>Your referral url</strong>
-          </Txt>
-          <Txt fontSize={14} center>
-            {referralLink ? (
-              <>
-                <span style={{ wordBreak: 'break-all', display: 'inline-block' }}>
-                  {referralLink.prefix}
-                  {chainId === ChainId.GNOSIS_CHAIN ? (
-                    <strong>{shortenAddress(referralLink.address)}</strong>
-                  ) : (
-                    <AddressSelector address={referralLink.address} />
-                  )}
-
-                  <span style={{ display: 'inline-block', verticalAlign: 'middle', marginLeft: 8 }}>
-                    <Copy
-                      toCopy={
-                        selectedAddress && chainId !== ChainId.GNOSIS_CHAIN
-                          ? `${referralLink.prefix}${selectedAddress}`
-                          : referralLink.link
-                      }
-                    />
-                  </span>
-                </span>
-              </>
-            ) : (
-              '-'
-            )}
-          </Txt>
-        </ChildWrapper>
-        <GridWrap horizontal>
-          <ChildWrapper>
-            <ItemTitle>
-              Trades
-              <MouseoverTooltipContent content="Statistics regarding your own trades." wrap>
-                <HelpCircle size={14} />
-              </MouseoverTooltipContent>
-            </ItemTitle>
-            <FlexWrap className="item">
-              <FlexCol>
-                <span role="img" aria-label="farmer">
-                  🧑‍🌾
-                </span>
-                <Loader isLoading={isLoading}>
-                  <strong>{formatInt(profileData?.totalTrades)}</strong>
-                </Loader>
-                <Loader isLoading={isLoading}>
-                  <Txt gap={4}>
-                    Total trades
-                    {isTradesTooltipVisible && (
-                      <MouseoverTooltipContent
-                        content="You may see more trades here than what you see in the activity list. To understand why, check out the FAQ."
-                        wrap
-                      >
-                        <HelpCircle size={14} />
-                      </MouseoverTooltipContent>
-                    )}
-                  </Txt>
-                </Loader>
-              </FlexCol>
-              <FlexCol>
-                <span role="img" aria-label="moneybag">
-                  💰
-                </span>
-                <Loader isLoading={isLoading}>
-                  <strong>{formatDecimal(profileData?.tradeVolumeUsd)}</strong>
-                </Loader>
-                <Loader isLoading={isLoading}>
-                  <span>Total traded volume</span>
-                </Loader>
-              </FlexCol>
-            </FlexWrap>
-          </ChildWrapper>
-          <ChildWrapper>
-            <ItemTitle>
-              Referrals
-              <MouseoverTooltipContent
-                content="Statistics regarding trades by people who used your referral link."
-                wrap
-              >
-                <HelpCircle size={14} />
-              </MouseoverTooltipContent>
-            </ItemTitle>
-            <FlexWrap className="item">
-              <FlexCol>
-                <span role="img" aria-label="handshake">
-                  🤝
-                </span>
-                <Loader isLoading={isLoading}>
-                  <strong>{formatInt(profileData?.totalReferrals)}</strong>
-                </Loader>
-                <Loader isLoading={isLoading}>
-                  <span>Total referrals</span>
-                </Loader>
-              </FlexCol>
-              <FlexCol>
-                <span role="img" aria-label="wingedmoney">
-                  💸
-                </span>
-                <Loader isLoading={isLoading}>
-                  <strong>{formatDecimal(profileData?.referralVolumeUsd)}</strong>
-                </Loader>
-                <Loader isLoading={isLoading}>
-                  <span>Referrals volume</span>
-                </Loader>
-              </FlexCol>
-            </FlexWrap>
-          </ChildWrapper>
-        </GridWrap>
-        {!account && <Web3Status />}
-      </GridWrap>
-    </Wrapper>
-  )
-}

From 5aba7cb5d12e777cab15c405ae21d5d6e9e4d506 Mon Sep 17 00:00:00 2001
From: Alexandr Kazachenko <shoom3301@gmail.com>
Date: Tue, 13 Jun 2023 17:48:31 +0600
Subject: [PATCH 15/67] feat(twap): add ComposableCowInfo to Order model
 (#2622)

---
 src/api/gnosisProtocol/hooks.ts               | 48 ++++++++++++++-----
 src/common/types.ts                           | 18 +++++++
 src/legacy/state/orders/actions.ts            |  7 +++
 .../state/orders/updaters/GpOrdersUpdater.ts  | 16 +++++--
 src/modules/twap/state/twapOrdersListAtom.ts  | 16 +++++--
 src/modules/twap/types.ts                     |  2 +-
 .../twap/utils/buildTwapOrdersItems.ts        |  4 +-
 src/modules/twap/utils/emulateTwapAsOrder.ts  |  4 +-
 src/utils/deepEqual.ts                        | 25 ++++++++++
 9 files changed, 114 insertions(+), 26 deletions(-)
 create mode 100644 src/common/types.ts
 create mode 100644 src/utils/deepEqual.ts

diff --git a/src/api/gnosisProtocol/hooks.ts b/src/api/gnosisProtocol/hooks.ts
index 08c2aa50f8..b786698965 100644
--- a/src/api/gnosisProtocol/hooks.ts
+++ b/src/api/gnosisProtocol/hooks.ts
@@ -7,12 +7,15 @@ import useSWR from 'swr'
 
 import { AMOUNT_OF_ORDERS_TO_FETCH } from 'legacy/constants'
 import { isBarnBackendEnv } from 'legacy/utils/environments'
+import { isTruthy } from 'legacy/utils/misc'
 import { supportedChainId } from 'legacy/utils/supportedChainId'
 
 import { emulatedTwapOrdersAtom } from 'modules/twap/state/twapOrdersListAtom'
 import { TwapPartOrderItem, twapPartOrdersListAtom } from 'modules/twap/state/twapPartOrdersAtom'
 import { useWalletInfo } from 'modules/wallet'
 
+import { OrderWithComposableCowInfo } from 'common/types'
+
 import { getOrders } from './api'
 
 /**
@@ -27,11 +30,10 @@ import { getOrders } from './api'
  * For non-PROD environment we do two requests: barn and prod
  * For PROD environment we do only one: prod. It depends on isBarnBackendEnv
  */
-export function useGpOrders(account?: string | null, refreshInterval?: number): EnrichedOrder[] {
+export function useGpOrders(account?: string | null, refreshInterval?: number): OrderWithComposableCowInfo[] {
   const { chainId: _chainId } = useWalletInfo()
   const chainId = supportedChainId(_chainId)
   const emulatedTwapOrders = useAtomValue(emulatedTwapOrdersAtom)
-  const twapParticleOrders = useAtomValue(twapPartOrdersListAtom)
 
   const requestParams = useMemo(() => {
     return account ? { owner: account, limit: AMOUNT_OF_ORDERS_TO_FETCH } : null
@@ -65,8 +67,24 @@ export function useGpOrders(account?: string | null, refreshInterval?: number):
     return isBarnBackendEnv ? loadedProdOrders : currentEnvOrders
   }, [currentEnvOrders, loadedProdOrders])
 
-  // Take only orders are connected to TWAP orders
-  const twapRelatedOrders = useMemo(() => {
+  const twapChildOrders = useTwapChildOrders(prodOrders)
+
+  const regularOrders: OrderWithComposableCowInfo[] = useMemo(() => {
+    if (!currentEnvOrders) return []
+
+    return currentEnvOrders.map((order) => ({ order }))
+  }, [currentEnvOrders])
+
+  return useMemo(() => {
+    return [...regularOrders, ...emulatedTwapOrders, ...twapChildOrders]
+  }, [regularOrders, emulatedTwapOrders, twapChildOrders])
+}
+
+// Take only orders are connected to TWAP orders
+function useTwapChildOrders(prodOrders: EnrichedOrder[] | undefined): OrderWithComposableCowInfo[] {
+  const twapParticleOrders = useAtomValue(twapPartOrdersListAtom)
+
+  return useMemo(() => {
     if (!prodOrders) return []
 
     const particleOrdersMap = twapParticleOrders.reduce<{ [uid: string]: TwapPartOrderItem }>((acc, val) => {
@@ -75,15 +93,21 @@ export function useGpOrders(account?: string | null, refreshInterval?: number):
       return acc
     }, {})
 
-    return prodOrders.filter((order) => {
-      return particleOrdersMap[order.uid]
-    })
-  }, [twapParticleOrders, prodOrders])
+    return prodOrders
+      .map((order) => {
+        const particleOrder = particleOrdersMap[order.uid]
 
-  // Add only TWAP-related orders to the common list of orders
-  return useMemo(() => {
-    return [...(currentEnvOrders || []), ...emulatedTwapOrders, ...twapRelatedOrders]
-  }, [currentEnvOrders, emulatedTwapOrders, twapRelatedOrders])
+        if (!particleOrder) return null
+
+        return {
+          order,
+          composableCowInfo: {
+            parentId: particleOrder.twapOrderId,
+          },
+        } as OrderWithComposableCowInfo
+      })
+      .filter(isTruthy)
+  }, [twapParticleOrders, prodOrders])
 }
 
 export function useHasOrders(account?: string | null): boolean | undefined {
diff --git a/src/common/types.ts b/src/common/types.ts
new file mode 100644
index 0000000000..435fe19ee3
--- /dev/null
+++ b/src/common/types.ts
@@ -0,0 +1,18 @@
+import { EnrichedOrder } from '@cowprotocol/cow-sdk'
+
+/**
+ * https://github.com/rndlabs/composable-cow/blob/main/src/ComposableCoW.sol
+ * Information about ComposableCoW conditional orders
+ *
+ * id - this parameter is specified when it's a conditional (parent) order
+ * parentId - this parameter is specified when it's a discrete (child) order
+ */
+export type ComposableCowInfo = {
+  id?: string
+  parentId?: string
+}
+
+export type OrderWithComposableCowInfo = {
+  order: EnrichedOrder
+  composableCowInfo?: ComposableCowInfo
+}
diff --git a/src/legacy/state/orders/actions.ts b/src/legacy/state/orders/actions.ts
index 8279eddafe..4c58edb276 100644
--- a/src/legacy/state/orders/actions.ts
+++ b/src/legacy/state/orders/actions.ts
@@ -8,6 +8,8 @@ import { createAction } from '@reduxjs/toolkit'
 
 import { SerializedToken } from 'legacy/state/user/types'
 
+import { ComposableCowInfo } from 'common/types'
+
 export enum OrderStatus {
   PENDING = 'pending',
   PRESIGNATURE_PENDING = 'presignaturePending',
@@ -75,6 +77,11 @@ export interface BaseOrder extends Omit<OrderCreation, 'signingScheme'> {
    * The order data is local to the device where the order was initiated
    */
   isHidden?: boolean
+
+  /**
+   * ComposableCoW-specific info
+   */
+  composableCowInfo?: ComposableCowInfo
 }
 
 /**
diff --git a/src/legacy/state/orders/updaters/GpOrdersUpdater.ts b/src/legacy/state/orders/updaters/GpOrdersUpdater.ts
index 69a959dda9..3caaea6d02 100644
--- a/src/legacy/state/orders/updaters/GpOrdersUpdater.ts
+++ b/src/legacy/state/orders/updaters/GpOrdersUpdater.ts
@@ -1,6 +1,6 @@
 import { useCallback, useEffect, useMemo, useRef } from 'react'
 
-import { EnrichedOrder, EthflowData, OrderClass, SupportedChainId as ChainId } from '@cowprotocol/cow-sdk'
+import { EthflowData, OrderClass, SupportedChainId as ChainId } from '@cowprotocol/cow-sdk'
 import { getAddress } from '@ethersproject/address'
 import { Token } from '@uniswap/sdk-core'
 
@@ -16,6 +16,7 @@ import { supportedChainId } from 'legacy/utils/supportedChainId'
 import { useWalletInfo } from 'modules/wallet'
 
 import { useGpOrders } from 'api/gnosisProtocol/hooks'
+import { OrderWithComposableCowInfo } from 'common/types'
 
 function _getTokenFromMapping(
   address: string,
@@ -41,7 +42,7 @@ const statusMapping: Record<OrderTransitionStatus, OrderStatus | undefined> = {
 }
 
 function _transformGpOrderToStoreOrder(
-  order: EnrichedOrder,
+  { order, composableCowInfo }: OrderWithComposableCowInfo,
   chainId: ChainId,
   allTokens: { [address: string]: Token | null }
 ): Order | undefined {
@@ -99,6 +100,7 @@ function _transformGpOrderToStoreOrder(
     refundHash: ethflowData?.refundTxHash || undefined,
     buyTokenBalance: order.buyTokenBalance,
     sellTokenBalance: order.sellTokenBalance,
+    composableCowInfo,
   }
 
   // The function to compute the summary needs the Order instance to exist already
@@ -126,14 +128,14 @@ function _getInputToken(
 }
 
 function _getMissingTokensAddresses(
-  orders: EnrichedOrder[],
+  orders: OrderWithComposableCowInfo[],
   tokens: Record<string, Token>,
   chainId: ChainId
 ): string[] {
   const tokensToFetch = new Set<string>()
 
   // Find out which tokens are not yet loaded in the UI
-  orders.forEach(({ sellToken, buyToken }) => {
+  orders.forEach(({ order: { sellToken, buyToken } }) => {
     if (!_getTokenFromMapping(sellToken, chainId, tokens)) tokensToFetch.add(sellToken)
     if (!_getTokenFromMapping(buyToken, chainId, tokens)) tokensToFetch.add(buyToken)
   })
@@ -160,7 +162,11 @@ async function _fetchTokens(
   }, {})
 }
 
-function _filterOrders(orders: EnrichedOrder[], tokens: Record<string, Token | null>, chainId: ChainId): Order[] {
+function _filterOrders(
+  orders: OrderWithComposableCowInfo[],
+  tokens: Record<string, Token | null>,
+  chainId: ChainId
+): Order[] {
   return orders.reduce<Order[]>((acc, order) => {
     const storeOrder = _transformGpOrderToStoreOrder(order, chainId, tokens)
     if (storeOrder) {
diff --git a/src/modules/twap/state/twapOrdersListAtom.ts b/src/modules/twap/state/twapOrdersListAtom.ts
index 8206a3aded..a2519af0c5 100644
--- a/src/modules/twap/state/twapOrdersListAtom.ts
+++ b/src/modules/twap/state/twapOrdersListAtom.ts
@@ -1,17 +1,18 @@
 import { atom } from 'jotai'
 import { atomWithStorage } from 'jotai/utils'
 
-import deepEqual from 'fast-deep-equal'
-
 import { tokensByAddressAtom } from 'modules/tokensList/state/tokensListAtom'
 import { walletInfoAtom } from 'modules/wallet/api/state'
 
+import { OrderWithComposableCowInfo } from 'common/types'
+import { deepEqual } from 'utils/deepEqual'
+
 import { TwapOrderItem } from '../types'
 import { emulateTwapAsOrder } from '../utils/emulateTwapAsOrder'
 
 export type TwapOrdersList = { [key: string]: TwapOrderItem }
 
-export const twapOrdersListAtom = atomWithStorage<TwapOrdersList>('twap-orders-list:v2', {})
+export const twapOrdersListAtom = atomWithStorage<TwapOrdersList>('twap-orders-list:v3', {})
 
 export const updateTwapOrdersListAtom = atom(null, (get, set, nextState: TwapOrdersList) => {
   const currentState = get(twapOrdersListAtom)
@@ -31,5 +32,12 @@ export const emulatedTwapOrdersAtom = atom((get) => {
 
   return orders
     .filter((order) => order.chainId === chainId && order.safeAddress.toLowerCase() === accountLowerCase)
-    .map((order) => emulateTwapAsOrder(tokens, order))
+    .map((order) => {
+      return {
+        order: emulateTwapAsOrder(tokens, order),
+        composableCowInfo: {
+          uid: order.id,
+        },
+      }
+    }) as OrderWithComposableCowInfo[]
 })
diff --git a/src/modules/twap/types.ts b/src/modules/twap/types.ts
index 8349aa348f..b974ede035 100644
--- a/src/modules/twap/types.ts
+++ b/src/modules/twap/types.ts
@@ -42,7 +42,7 @@ export interface TwapOrderItem {
   status: TwapOrderStatus
   chainId: SupportedChainId
   safeAddress: string
-  hash: string
+  id: string
   submissionDate: string
 }
 
diff --git a/src/modules/twap/utils/buildTwapOrdersItems.ts b/src/modules/twap/utils/buildTwapOrdersItems.ts
index 6f95c30d40..7445c6bed3 100644
--- a/src/modules/twap/utils/buildTwapOrdersItems.ts
+++ b/src/modules/twap/utils/buildTwapOrdersItems.ts
@@ -27,7 +27,7 @@ function getTwapOrderItem(
   chainId: SupportedChainId,
   safeAddress: string,
   safeData: TwapOrdersSafeData,
-  hash: string,
+  id: string,
   authorized: boolean,
   discreteOrder: Order | undefined
 ): TwapOrderItem {
@@ -41,7 +41,7 @@ function getTwapOrderItem(
     status,
     chainId,
     safeAddress,
-    hash,
+    id,
     submissionDate,
   }
 }
diff --git a/src/modules/twap/utils/emulateTwapAsOrder.ts b/src/modules/twap/utils/emulateTwapAsOrder.ts
index 6f3d7263ab..bc045b7856 100644
--- a/src/modules/twap/utils/emulateTwapAsOrder.ts
+++ b/src/modules/twap/utils/emulateTwapAsOrder.ts
@@ -14,7 +14,7 @@ const statusMap: Record<TwapOrderStatus, OrderStatus> = {
 }
 
 export function emulateTwapAsOrder(tokens: TokensByAddress, item: TwapOrderItem): EnrichedOrder {
-  const { safeAddress, hash, status } = item
+  const { safeAddress, id, status } = item
   const { sellToken, buyToken, partSellAmount, minPartLimit, n, t } = item.order
   const numOfParts = BigInt(n)
   const sellAmount = BigInt(partSellAmount) * numOfParts
@@ -29,7 +29,7 @@ export function emulateTwapAsOrder(tokens: TokensByAddress, item: TwapOrderItem)
     sellToken,
     buyToken,
     validTo: Math.ceil(expirationTime.getTime() / 1000),
-    uid: hash,
+    uid: id,
     sellAmount: sellAmount.toString(),
     buyAmount: buyAmount.toString(),
     kind: OrderKind.SELL,
diff --git a/src/utils/deepEqual.ts b/src/utils/deepEqual.ts
new file mode 100644
index 0000000000..1200fc15a9
--- /dev/null
+++ b/src/utils/deepEqual.ts
@@ -0,0 +1,25 @@
+// https://dmitripavlutin.com/how-to-compare-objects-in-javascript/
+export function deepEqual(object1: any, object2: typeof object1): boolean {
+  const keys1 = Object.keys(object1)
+  const keys2 = Object.keys(object2)
+
+  if (keys1.length !== keys2.length) {
+    return false
+  }
+
+  for (const key of keys1) {
+    const val1 = object1[key]
+    const val2 = object2[key]
+    const areObjects = isObject(val1) && isObject(val2)
+
+    if ((areObjects && !deepEqual(val1, val2)) || (!areObjects && val1 !== val2)) {
+      return false
+    }
+  }
+
+  return true
+}
+
+function isObject(object: unknown): object is Object {
+  return object != null && typeof object === 'object'
+}

From 55830a259a7d5289331c596fd05a63dde1f0b056 Mon Sep 17 00:00:00 2001
From: Alexandr Kazachenko <shoom3301@gmail.com>
Date: Tue, 13 Jun 2023 17:55:01 +0600
Subject: [PATCH 16/67] feat(twap): twap orders cancellation (#2623)

---
 src/abis/ComposableCoW.json                   | 13 ++++++
 src/api/gnosisProtocol/hooks.ts               |  4 +-
 .../useCancelOrder/onChainCancellation.ts     | 30 +++++++++----
 .../useGetOnChainCancellation.ts              | 14 +++++--
 .../useSendOnChainCancellation.test.ts        |  7 ++--
 .../useSendOnChainCancellation.ts             | 26 ++++++------
 .../OrdersTableContainer/OrderRow/index.tsx   |  2 +-
 src/modules/twap/hooks/useCancelTwapOrder.ts  | 42 +++++++++++++++++++
 .../twap/services/cancelTwapOrderTxs.ts       | 42 +++++++++++++++++++
 src/modules/twap/state/twapOrdersListAtom.ts  |  8 ++--
 .../twap/updaters/TwapOrdersUpdater.tsx       |  6 +--
 src/modules/twap/utils/emulateTwapAsOrder.ts  |  2 +-
 12 files changed, 158 insertions(+), 38 deletions(-)
 create mode 100644 src/modules/twap/hooks/useCancelTwapOrder.ts
 create mode 100644 src/modules/twap/services/cancelTwapOrderTxs.ts

diff --git a/src/abis/ComposableCoW.json b/src/abis/ComposableCoW.json
index f86d84a355..3a82a38845 100644
--- a/src/abis/ComposableCoW.json
+++ b/src/abis/ComposableCoW.json
@@ -161,5 +161,18 @@
     ],
     "stateMutability": "view",
     "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "bytes32",
+        "name": "singleOrderHash",
+        "type": "bytes32"
+      }
+    ],
+    "name": "remove",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
   }
 ]
diff --git a/src/api/gnosisProtocol/hooks.ts b/src/api/gnosisProtocol/hooks.ts
index b786698965..7c4c78a3a5 100644
--- a/src/api/gnosisProtocol/hooks.ts
+++ b/src/api/gnosisProtocol/hooks.ts
@@ -93,7 +93,7 @@ function useTwapChildOrders(prodOrders: EnrichedOrder[] | undefined): OrderWithC
       return acc
     }, {})
 
-    return prodOrders
+    const orderWithComposableCowInfo: OrderWithComposableCowInfo[] = prodOrders
       .map((order) => {
         const particleOrder = particleOrdersMap[order.uid]
 
@@ -107,6 +107,8 @@ function useTwapChildOrders(prodOrders: EnrichedOrder[] | undefined): OrderWithC
         } as OrderWithComposableCowInfo
       })
       .filter(isTruthy)
+
+    return orderWithComposableCowInfo
   }, [twapParticleOrders, prodOrders])
 }
 
diff --git a/src/common/hooks/useCancelOrder/onChainCancellation.ts b/src/common/hooks/useCancelOrder/onChainCancellation.ts
index ed6dbace64..ce0ab54fb0 100644
--- a/src/common/hooks/useCancelOrder/onChainCancellation.ts
+++ b/src/common/hooks/useCancelOrder/onChainCancellation.ts
@@ -1,21 +1,21 @@
 import { BigNumber } from '@ethersproject/bignumber'
-import { ContractTransaction } from '@ethersproject/contracts'
 
 import { Order } from 'legacy/state/orders/actions'
 import { calculateGasMargin } from 'legacy/utils/calculateGasMargin'
 
-import { ETHFLOW_GAS_LIMIT_DEFAULT } from 'modules/swap/services/ethFlow/const'
 import { logTradeFlowError } from 'modules/trade/utils/logger'
 
 import { GPv2Settlement } from 'abis/types'
 import { CoWSwapEthFlow } from 'abis/types/ethflow'
 
+// Fallback If we couldn't estimate gas for on-chain cancellation
+const CANCELLATION_GAS_LIMIT_DEFAULT = BigNumber.from(150000)
 const LOG_LABEL = 'CANCEL ETH FLOW ORDER'
 
 export interface OnChainCancellation {
   estimatedGas: BigNumber
 
-  sendTransaction(): Promise<ContractTransaction>
+  sendTransaction(): Promise<string>
 }
 
 export async function getEthFlowCancellation(
@@ -35,14 +35,20 @@ export async function getEthFlowCancellation(
   }
 
   const estimatedGas = await ethFlowContract.estimateGas.invalidateOrder(cancelOrderParams).catch((error: Error) => {
-    logTradeFlowError(LOG_LABEL, `Error estimating createOrder gas. Using default ${ETHFLOW_GAS_LIMIT_DEFAULT}`, error)
-    return ETHFLOW_GAS_LIMIT_DEFAULT
+    logTradeFlowError(
+      LOG_LABEL,
+      `Error estimating invalidateOrder gas. Using default ${CANCELLATION_GAS_LIMIT_DEFAULT}`,
+      error
+    )
+    return CANCELLATION_GAS_LIMIT_DEFAULT
   })
 
   return {
     estimatedGas,
     sendTransaction: () => {
-      return ethFlowContract.invalidateOrder(cancelOrderParams, { gasLimit: calculateGasMargin(estimatedGas) })
+      return ethFlowContract
+        .invalidateOrder(cancelOrderParams, { gasLimit: calculateGasMargin(estimatedGas) })
+        .then((res) => res.hash)
     },
   }
 }
@@ -51,14 +57,20 @@ export async function getOnChainCancellation(contract: GPv2Settlement, order: Or
   const cancelOrderParams = order.id
 
   const estimatedGas = await contract.estimateGas.invalidateOrder(cancelOrderParams).catch((error: Error) => {
-    logTradeFlowError(LOG_LABEL, `Error estimating createOrder gas. Using default ${ETHFLOW_GAS_LIMIT_DEFAULT}`, error)
-    return ETHFLOW_GAS_LIMIT_DEFAULT
+    logTradeFlowError(
+      LOG_LABEL,
+      `Error estimating invalidateOrder gas. Using default ${CANCELLATION_GAS_LIMIT_DEFAULT}`,
+      error
+    )
+    return CANCELLATION_GAS_LIMIT_DEFAULT
   })
 
   return {
     estimatedGas,
     sendTransaction: () => {
-      return contract.invalidateOrder(cancelOrderParams, { gasLimit: calculateGasMargin(estimatedGas) })
+      return contract
+        .invalidateOrder(cancelOrderParams, { gasLimit: calculateGasMargin(estimatedGas) })
+        .then((res) => res.hash)
     },
   }
 }
diff --git a/src/common/hooks/useCancelOrder/useGetOnChainCancellation.ts b/src/common/hooks/useCancelOrder/useGetOnChainCancellation.ts
index 199d82970f..15dfba235d 100644
--- a/src/common/hooks/useCancelOrder/useGetOnChainCancellation.ts
+++ b/src/common/hooks/useCancelOrder/useGetOnChainCancellation.ts
@@ -4,6 +4,7 @@ import { useEthFlowContract, useGP2SettlementContract } from 'legacy/hooks/useCo
 import { Order } from 'legacy/state/orders/actions'
 
 import { getIsEthFlowOrder } from 'modules/swap/containers/EthFlowStepper'
+import { useCancelTwapOrder } from 'modules/twap/hooks/useCancelTwapOrder'
 
 import {
   getEthFlowCancellation,
@@ -14,17 +15,24 @@ import {
 export function useGetOnChainCancellation(): (order: Order) => Promise<OnChainCancellation> {
   const ethFlowContract = useEthFlowContract()
   const settlementContract = useGP2SettlementContract()
+  const cancelTwapOrder = useCancelTwapOrder()
 
   return useCallback(
     (order: Order) => {
+      const composableCowId = order.composableCowInfo?.id
+
+      if (composableCowId) {
+        return cancelTwapOrder(composableCowId)
+      }
+
       const isEthFlowOrder = getIsEthFlowOrder(order)
 
       if (isEthFlowOrder) {
         return getEthFlowCancellation(ethFlowContract!, order)
-      } else {
-        return getOnChainCancellation(settlementContract!, order)
       }
+
+      return getOnChainCancellation(settlementContract!, order)
     },
-    [ethFlowContract, settlementContract]
+    [ethFlowContract, settlementContract, cancelTwapOrder]
   )
 }
diff --git a/src/common/hooks/useCancelOrder/useSendOnChainCancellation.test.ts b/src/common/hooks/useCancelOrder/useSendOnChainCancellation.test.ts
index f0d8376649..133c7a8282 100644
--- a/src/common/hooks/useCancelOrder/useSendOnChainCancellation.test.ts
+++ b/src/common/hooks/useCancelOrder/useSendOnChainCancellation.test.ts
@@ -12,6 +12,7 @@ import { useRequestOrderCancellation, useSetOrderCancellationHash } from 'legacy
 import { useWalletInfo } from 'modules/wallet'
 
 import { useSendOnChainCancellation } from './useSendOnChainCancellation'
+import { WithMockedWeb3 } from '../../../test-utils'
 
 const chainId = 1
 const settlementCancellationTxHash = '0xcfwj23g4fwe111'
@@ -88,7 +89,7 @@ describe('useSendOnChainCancellation() + useGetOnChainCancellation()', () => {
   })
 
   it('When is ETH-flow order, then should call eth-flow contract', async () => {
-    const { result } = renderHook(() => useSendOnChainCancellation())
+    const { result } = renderHook(() => useSendOnChainCancellation(), { wrapper: WithMockedWeb3 })
 
     await result.current({ ...orderMock, inputToken: NATIVE_CURRENCY_BUY_TOKEN[chainId] })
 
@@ -98,7 +99,7 @@ describe('useSendOnChainCancellation() + useGetOnChainCancellation()', () => {
   })
 
   it('When is NOT ETH-flow order, then should call settlement contract', async () => {
-    const { result } = renderHook(() => useSendOnChainCancellation())
+    const { result } = renderHook(() => useSendOnChainCancellation(), { wrapper: WithMockedWeb3 })
 
     await result.current({ ...orderMock, inputToken: COW[chainId] })
 
@@ -109,7 +110,7 @@ describe('useSendOnChainCancellation() + useGetOnChainCancellation()', () => {
 
   describe('When a transaction is sent', () => {
     it('Then should change an order status, set a tx hash to order and add the transaction to store', async () => {
-      const { result } = renderHook(() => useSendOnChainCancellation())
+      const { result } = renderHook(() => useSendOnChainCancellation(), { wrapper: WithMockedWeb3 })
 
       await result.current({ ...orderMock, inputToken: COW[chainId] })
 
diff --git a/src/common/hooks/useCancelOrder/useSendOnChainCancellation.ts b/src/common/hooks/useCancelOrder/useSendOnChainCancellation.ts
index c0946c5872..93516b7aa9 100644
--- a/src/common/hooks/useCancelOrder/useSendOnChainCancellation.ts
+++ b/src/common/hooks/useCancelOrder/useSendOnChainCancellation.ts
@@ -25,20 +25,18 @@ export function useSendOnChainCancellation() {
       const isEthFlowOrder = getIsEthFlowOrder(order)
       const { sendTransaction } = await getOnChainCancellation(order)
 
-      const receipt = await sendTransaction()
-
-      if (receipt?.hash) {
-        cancelPendingOrder({ id: order.id, chainId })
-        setOrderCancellationHash({ chainId, id: order.id, hash: receipt.hash })
-
-        if (isEthFlowOrder) {
-          addTransaction({ hash: receipt.hash, ethFlow: { orderId: order.id, subType: 'cancellation' } })
-        } else {
-          addTransaction({
-            hash: receipt.hash,
-            onChainCancellation: { orderId: order.id, sellTokenSymbol: order.inputToken.symbol || '' },
-          })
-        }
+      const hash = await sendTransaction()
+
+      cancelPendingOrder({ id: order.id, chainId })
+      setOrderCancellationHash({ chainId, id: order.id, hash })
+
+      if (isEthFlowOrder) {
+        addTransaction({ hash, ethFlow: { orderId: order.id, subType: 'cancellation' } })
+      } else {
+        addTransaction({
+          hash,
+          onChainCancellation: { orderId: order.id, sellTokenSymbol: order.inputToken.symbol || '' },
+        })
       }
     },
     [addTransaction, getOnChainCancellation, cancelPendingOrder, chainId, setOrderCancellationHash]
diff --git a/src/modules/ordersTable/pure/OrdersTableContainer/OrderRow/index.tsx b/src/modules/ordersTable/pure/OrdersTableContainer/OrderRow/index.tsx
index c34e929ba5..325df5d4e9 100644
--- a/src/modules/ordersTable/pure/OrdersTableContainer/OrderRow/index.tsx
+++ b/src/modules/ordersTable/pure/OrdersTableContainer/OrderRow/index.tsx
@@ -176,7 +176,7 @@ export function OrderRow({
   const isOrderCreating = CREATING_STATES.includes(order.status)
 
   return (
-    <TableRow isOpenOrdersTab={isOpenOrdersTab} isRowSelectable={isRowSelectable}>
+    <TableRow data-id={order.id} isOpenOrdersTab={isOpenOrdersTab} isRowSelectable={isRowSelectable}>
       {/*Checkbox for multiple cancellation*/}
       {isRowSelectable && isOpenOrdersTab && (
         <TableRowCheckboxWrapper>
diff --git a/src/modules/twap/hooks/useCancelTwapOrder.ts b/src/modules/twap/hooks/useCancelTwapOrder.ts
new file mode 100644
index 0000000000..a3ab16348e
--- /dev/null
+++ b/src/modules/twap/hooks/useCancelTwapOrder.ts
@@ -0,0 +1,42 @@
+import { useAtomValue } from 'jotai/utils'
+import { useCallback } from 'react'
+
+import { BigNumber } from '@ethersproject/bignumber'
+
+import { useGP2SettlementContract } from 'legacy/hooks/useContract'
+
+import { useComposableCowContract } from 'modules/advancedOrders/hooks/useComposableCowContract'
+import { useSafeAppsSdk } from 'modules/wallet/web3-react/hooks/useSafeAppsSdk'
+
+import { cancelTwapOrderTxs, estimateCancelTwapOrderTxs } from '../services/cancelTwapOrderTxs'
+import { twapPartOrdersListAtom } from '../state/twapPartOrdersAtom'
+
+type TwapCancellation = { estimatedGas: BigNumber; sendTransaction(): Promise<string> }
+
+export function useCancelTwapOrder(): (orderId: string) => Promise<TwapCancellation> {
+  const twapPartOrders = useAtomValue(twapPartOrdersListAtom)
+  const safeAppsSdk = useSafeAppsSdk()
+  const settlementContract = useGP2SettlementContract()
+  const composableCowContract = useComposableCowContract()
+
+  return useCallback(
+    async (orderId: string) => {
+      if (!composableCowContract || !settlementContract || !safeAppsSdk) {
+        throw new Error('Context is not full to cancel TWAP order')
+      }
+
+      const partOrder = twapPartOrders.find((item) => item.twapOrderId === orderId)
+      const partOrderId = partOrder?.uid
+
+      const context = { composableCowContract, settlementContract, orderId, partOrderId }
+
+      return {
+        estimatedGas: await estimateCancelTwapOrderTxs(context),
+        sendTransaction: () => {
+          return safeAppsSdk.txs.send({ txs: cancelTwapOrderTxs(context) }).then((res) => res.safeTxHash)
+        },
+      }
+    },
+    [composableCowContract, settlementContract, safeAppsSdk, twapPartOrders]
+  )
+}
diff --git a/src/modules/twap/services/cancelTwapOrderTxs.ts b/src/modules/twap/services/cancelTwapOrderTxs.ts
new file mode 100644
index 0000000000..2eecd2b29d
--- /dev/null
+++ b/src/modules/twap/services/cancelTwapOrderTxs.ts
@@ -0,0 +1,42 @@
+import { BigNumber } from '@ethersproject/bignumber'
+import { MetaTransactionData } from '@safe-global/safe-core-sdk-types'
+
+import { ComposableCoW, GPv2Settlement } from 'abis/types'
+
+export interface CancelTwapOrderContext {
+  composableCowContract: ComposableCoW
+  settlementContract: GPv2Settlement
+  orderId: string
+  partOrderId?: string
+}
+export function cancelTwapOrderTxs(context: CancelTwapOrderContext): MetaTransactionData[] {
+  const { composableCowContract, settlementContract, orderId, partOrderId } = context
+  const cancelTwapOrderTx = {
+    to: composableCowContract.address,
+    data: composableCowContract.interface.encodeFunctionData('remove', [orderId]),
+    value: '0',
+    operation: 0,
+  }
+
+  if (!partOrderId) return [cancelTwapOrderTx]
+
+  const cancelTwapPartOrderTx = {
+    to: settlementContract.address,
+    data: settlementContract.interface.encodeFunctionData('invalidateOrder', [partOrderId]),
+    value: '0',
+    operation: 0,
+  }
+
+  return [cancelTwapOrderTx, cancelTwapPartOrderTx]
+}
+
+export async function estimateCancelTwapOrderTxs(context: CancelTwapOrderContext): Promise<BigNumber> {
+  const { composableCowContract, settlementContract, orderId, partOrderId } = context
+  const canelComposableCowTxCost = await composableCowContract.estimateGas.remove(orderId)
+
+  if (!partOrderId) return canelComposableCowTxCost
+
+  const cancelPartOrderTx = await settlementContract.estimateGas.invalidateOrder(partOrderId)
+
+  return canelComposableCowTxCost.add(cancelPartOrderTx)
+}
diff --git a/src/modules/twap/state/twapOrdersListAtom.ts b/src/modules/twap/state/twapOrdersListAtom.ts
index a2519af0c5..c1168ef674 100644
--- a/src/modules/twap/state/twapOrdersListAtom.ts
+++ b/src/modules/twap/state/twapOrdersListAtom.ts
@@ -30,14 +30,16 @@ export const emulatedTwapOrdersAtom = atom((get) => {
 
   if (!accountLowerCase) return []
 
-  return orders
+  const orderWithComposableCowInfo: OrderWithComposableCowInfo[] = orders
     .filter((order) => order.chainId === chainId && order.safeAddress.toLowerCase() === accountLowerCase)
     .map((order) => {
       return {
         order: emulateTwapAsOrder(tokens, order),
         composableCowInfo: {
-          uid: order.id,
+          id: order.id,
         },
       }
-    }) as OrderWithComposableCowInfo[]
+    })
+
+  return orderWithComposableCowInfo
 })
diff --git a/src/modules/twap/updaters/TwapOrdersUpdater.tsx b/src/modules/twap/updaters/TwapOrdersUpdater.tsx
index 8b3e4de30a..209b00fe48 100644
--- a/src/modules/twap/updaters/TwapOrdersUpdater.tsx
+++ b/src/modules/twap/updaters/TwapOrdersUpdater.tsx
@@ -27,7 +27,7 @@ export function TwapOrdersUpdater(props: {
 
   const twapDiscreteOrders = useTwapDiscreteOrders()
   const twapOrdersList = useAtomValue(twapOrdersListAtom)
-  const setTwapOrders = useUpdateAtom(updateTwapOrdersListAtom)
+  const updateTwapOrders = useUpdateAtom(updateTwapOrdersListAtom)
   const updateTwapPartOrders = useUpdateAtom(updateTwapPartOrdersAtom)
   const ordersSafeData = useFetchTwapOrdersFromSafe(props)
 
@@ -67,8 +67,8 @@ export function TwapOrdersUpdater(props: {
 
     const items = buildTwapOrdersItems(chainId, safeAddress, allOrdersInfo, ordersAuthResult, twapDiscreteOrders)
 
-    setTwapOrders(items)
-  }, [chainId, safeAddress, allOrdersInfo, ordersAuthResult, twapDiscreteOrders, setTwapOrders])
+    updateTwapOrders(items)
+  }, [chainId, safeAddress, allOrdersInfo, ordersAuthResult, twapDiscreteOrders, updateTwapOrders])
 
   useEffect(() => {
     if (!partOrders) return
diff --git a/src/modules/twap/utils/emulateTwapAsOrder.ts b/src/modules/twap/utils/emulateTwapAsOrder.ts
index bc045b7856..23b62eb9d5 100644
--- a/src/modules/twap/utils/emulateTwapAsOrder.ts
+++ b/src/modules/twap/utils/emulateTwapAsOrder.ts
@@ -46,6 +46,6 @@ export function emulateTwapAsOrder(tokens: TokensByAddress, item: TwapOrderItem)
     executedSellAmountBeforeFees: '0',
     executedBuyAmount: '0',
     executedFeeAmount: '0',
-    invalidated: false,
+    invalidated: status === TwapOrderStatus.Cancelled,
   }
 }

From f69371c29fd952f3aceade8d9ed0c9ea4f5eaf84 Mon Sep 17 00:00:00 2001
From: Leandro <alfetopito@users.noreply.github.com>
Date: Tue, 13 Jun 2023 07:07:29 -0700
Subject: [PATCH 17/67] feat(twap): twap review order - pt4 - duration fields
 (#2645)

* refactor: rename and export ConfirmDetailsItem Props

* refactor: use InfoIcon instead of re-creating the same component

* refactor: made TwapConfirmDetails a pure component

* feat: deadlinePartsDisplay outputs either 1h or 1 hour

* chore: hide start time for now

* feat: implement part and total duration

* refactor: move presentation of durations to TwapConfirmDetails

* feat: unhide Start time and set it to `Now`
---
 .../trade/pure/ConfirmDetailsItem/index.tsx   | 13 +++-----
 .../TwapConfirmModal/TwapConfirmDetails.tsx   | 30 ++++++++++++++-----
 .../containers/TwapConfirmModal/index.tsx     |  8 ++++-
 .../twap/utils/deadlinePartsDisplay.ts        | 10 +++----
 4 files changed, 39 insertions(+), 22 deletions(-)

diff --git a/src/modules/trade/pure/ConfirmDetailsItem/index.tsx b/src/modules/trade/pure/ConfirmDetailsItem/index.tsx
index 6e58e83278..470acb2d1d 100644
--- a/src/modules/trade/pure/ConfirmDetailsItem/index.tsx
+++ b/src/modules/trade/pure/ConfirmDetailsItem/index.tsx
@@ -2,15 +2,14 @@ import { ReactNode } from 'react'
 
 import { CornerDownRight } from 'react-feather'
 
+import { InfoIcon } from 'legacy/components/InfoIcon'
 import { RowFixed } from 'legacy/components/Row'
-import { MouseoverTooltipContent } from 'legacy/components/Tooltip'
 
 import { TextWrapper } from 'modules/swap/pure/Row/styled'
-import { StyledInfoIcon } from 'modules/swap/pure/styled'
 
 import { Content, Row, Wrapper } from './styled'
 
-type Props = {
+export type ConfirmDetailsItemProps = {
   children: ReactNode
   label?: string
   tooltip?: ReactNode
@@ -18,7 +17,7 @@ type Props = {
   fiatAmount?: string
 }
 
-export function ConfirmDetailsItem(props: Props) {
+export function ConfirmDetailsItem(props: ConfirmDetailsItemProps) {
   const { children, label, tooltip, withArrow = true } = props
 
   return (
@@ -30,11 +29,7 @@ export function ConfirmDetailsItem(props: Props) {
           <Row>
             <RowFixed>
               {label && <TextWrapper>{label}</TextWrapper>}
-              {tooltip && (
-                <MouseoverTooltipContent content={tooltip} wrap>
-                  <StyledInfoIcon size={16} />
-                </MouseoverTooltipContent>
-              )}
+              {tooltip && <InfoIcon content={tooltip} />}
             </RowFixed>
 
             <Content>{children}</Content>
diff --git a/src/modules/twap/containers/TwapConfirmModal/TwapConfirmDetails.tsx b/src/modules/twap/containers/TwapConfirmModal/TwapConfirmDetails.tsx
index d1b410e2ae..6198b69b13 100644
--- a/src/modules/twap/containers/TwapConfirmModal/TwapConfirmDetails.tsx
+++ b/src/modules/twap/containers/TwapConfirmModal/TwapConfirmDetails.tsx
@@ -1,30 +1,41 @@
+import React from 'react'
+
 import { ConfirmDetailsItem } from 'modules/trade/pure/ConfirmDetailsItem'
 import { ReviewOrderModalAmountRow } from 'modules/trade/pure/ReviewOrderModalAmountRow'
 
 import { PartsState } from '../../state/partsStateAtom'
+import { deadlinePartsDisplay } from '../../utils/deadlinePartsDisplay'
 
 export type TwapConfirmDetailsProps = {
   startTime: number | undefined
   partDuration: number | undefined
+  totalDuration: number | undefined
   partsState: PartsState
 }
 
-export function TwapConfirmDetails(_props: TwapConfirmDetailsProps) {
-  const { startTime, partDuration, partsState } = _props
+export const TwapConfirmDetails = React.memo(function TwapConfirmDetails(props: TwapConfirmDetailsProps) {
+  const { partDuration, totalDuration, partsState } = props
   const { numberOfPartsValue, inputPartAmount, inputFiatAmount, outputFiatAmount, outputPartAmount } = partsState
 
   const partsSuffix = ` part (1/${numberOfPartsValue})`
   const amountLabelSuffix = ' amount per' + partsSuffix
 
+  const partDurationDisplay = partDuration ? deadlinePartsDisplay(partDuration, true) : ''
+  const totalDurationDisplay = totalDuration ? deadlinePartsDisplay(totalDuration, true) : ''
+
   return (
     <div>
       <span>TWAP order split in {numberOfPartsValue} equal parts</span>
+
+      {/* Sell amount per part */}
       <ReviewOrderModalAmountRow
         amount={inputPartAmount}
         fiatAmount={inputFiatAmount}
         tooltip="TODO: add tooltip"
         label={'Sell' + amountLabelSuffix}
       />
+
+      {/* Buy amount per part */}
       <ReviewOrderModalAmountRow
         amount={outputPartAmount}
         fiatAmount={outputFiatAmount}
@@ -32,16 +43,21 @@ export function TwapConfirmDetails(_props: TwapConfirmDetailsProps) {
         label={'Buy' + amountLabelSuffix}
         isAmountAccurate={false}
       />
-      {/*TODO: implement logic for time fields*/}
+
+      {/* Start time */}
       <ConfirmDetailsItem tooltip="TODO: add tooltip" label={'Start time first' + partsSuffix} withArrow={false}>
-        {startTime}
+        Now
       </ConfirmDetailsItem>
+
+      {/* Part duration */}
       <ConfirmDetailsItem tooltip="TODO: add tooltip" label="Part duration" withArrow={false}>
-        {partDuration}
+        {partDurationDisplay}
       </ConfirmDetailsItem>
+
+      {/* Total duration */}
       <ConfirmDetailsItem tooltip="TODO: add tooltip" label="Total duration" withArrow={false}>
-        {partDuration}
+        {totalDurationDisplay}
       </ConfirmDetailsItem>
     </div>
   )
-}
+})
diff --git a/src/modules/twap/containers/TwapConfirmModal/index.tsx b/src/modules/twap/containers/TwapConfirmModal/index.tsx
index fa8f954fac..937344c24a 100644
--- a/src/modules/twap/containers/TwapConfirmModal/index.tsx
+++ b/src/modules/twap/containers/TwapConfirmModal/index.tsx
@@ -62,6 +62,11 @@ export function TwapConfirmModal() {
   // This already takes into account the full order
   const minReceivedAmount = twapOrder?.buyAmount
 
+  const { timeInterval, numOfParts } = twapOrder || {}
+
+  const partDuration = timeInterval
+  const totalDuration = timeInterval && numOfParts ? timeInterval * numOfParts : undefined
+
   return (
     <TradeConfirmModal>
       <TradeConfirmation
@@ -82,8 +87,9 @@ export function TwapConfirmModal() {
           />
           <TwapConfirmDetails
             startTime={twapOrder?.startTime}
-            partDuration={twapOrder?.timeInterval}
+            partDuration={partDuration}
             partsState={partsState}
+            totalDuration={totalDuration}
           />
         </>
       </TradeConfirmation>
diff --git a/src/modules/twap/utils/deadlinePartsDisplay.ts b/src/modules/twap/utils/deadlinePartsDisplay.ts
index 2caae40a52..709cb65b70 100644
--- a/src/modules/twap/utils/deadlinePartsDisplay.ts
+++ b/src/modules/twap/utils/deadlinePartsDisplay.ts
@@ -11,7 +11,7 @@ export function customDeadlineToSeconds(customDeadline: TwapOrdersDeadline['cust
   return minutesToSeconds
 }
 
-export function deadlinePartsDisplay(timeInterval: number): string {
+export function deadlinePartsDisplay(timeInterval: number, longLabels = false): string {
   const timeMs = ms(`${timeInterval * 1000}ms`)
 
   const days = Math.floor(timeMs / oneD)
@@ -20,10 +20,10 @@ export function deadlinePartsDisplay(timeInterval: number): string {
   const seconds = Math.floor((timeMs % oneM) / oneS)
 
   return [
-    [days, 'd'],
-    [hours, 'h'],
-    [minutes, 'm'],
-    [seconds, 's'],
+    [days, longLabels ? ' days' : 'd'],
+    [hours, longLabels ? ' hours' : 'h'],
+    [minutes, longLabels ? ' minutes' : 'm'],
+    [seconds, longLabels ? ' seconds' : 's'],
   ]
     .filter(([value]) => !!value)
     .map(([value, suffix]) => `${value}${suffix}`)

From feeba802f9d6875d1edd3271b41f2436616f3bdb Mon Sep 17 00:00:00 2001
From: Alexandr Kazachenko <shoom3301@gmail.com>
Date: Wed, 14 Jun 2023 13:52:05 +0600
Subject: [PATCH 18/67] fix(twap): improve twap orders state synchronisation
 (#2633)

---
 src/api/gnosisProtocol/api.ts                 | 23 ++++++---
 src/common/hooks/useCancelOrder/index.ts      |  2 +-
 .../useCancelOrder/onChainCancellation.ts     | 33 ++++++++++---
 .../useGetOnChainCancellation.ts              |  9 ++--
 .../useSendOnChainCancellation.test.ts        |  1 +
 .../useSendOnChainCancellation.ts             | 35 +++++++------
 .../utils/isOrderOffChainCancellable.ts       |  2 +-
 src/legacy/state/orders/reducer.ts            |  6 ++-
 src/legacy/state/orders/updaters/utils.ts     | 10 +++-
 .../ordersTable/pure/OrderStatusBox/index.tsx | 49 ++++++++++++-------
 .../OrdersTableContainer/OrderRow/index.tsx   |  2 +-
 .../swap/containers/EthFlowStepper/index.tsx  |  8 ++-
 src/modules/swap/services/types.ts            |  1 +
 src/modules/twap/const.ts                     |  3 +-
 src/modules/twap/hooks/useCancelTwapOrder.ts  | 31 +++++++++---
 src/modules/twap/hooks/useCreateTwapOrder.ts  | 35 ++++++++++++-
 .../twap/hooks/useFetchTwapPartOrders.ts      |  2 +-
 .../twap/hooks/useTwapOrderCreationContext.ts |  8 +--
 .../twap/hooks/useTwapOrdersAuthMulticall.ts  |  4 +-
 .../PrimaryActionButton/getTwapFormState.tsx  |  2 +-
 .../twap/pure/PrimaryActionButton/index.tsx   |  1 -
 .../twap/services/createTwapOrderTxs.test.ts  | 21 +++++---
 .../twap/services/createTwapOrderTxs.ts       | 48 ++++--------------
 .../twap/services/fetchTwapOrdersFromSafe.ts  |  8 ++-
 .../twap/services/settleTwapOrder.test.ts     |  8 ++-
 src/modules/twap/services/settleTwapOrder.ts  | 12 ++---
 src/modules/twap/state/twapOrdersListAtom.ts  | 12 ++++-
 src/modules/twap/state/twapPartOrdersAtom.ts  |  2 +-
 src/modules/twap/types.ts                     |  2 +-
 .../twap/updaters/TwapOrdersUpdater.tsx       | 16 +++---
 .../twap/utils/buildTwapOrderParamsStruct.ts  | 19 +++++++
 .../twap/utils/buildTwapOrdersItems.ts        |  7 +--
 src/modules/twap/utils/getTwapOrderStatus.ts  | 20 +++++++-
 src/modules/twap/utils/twapOrderToStruct.ts   | 15 ++++++
 .../twap/utils/updateTwapOrdersList.ts        | 25 ++++++++++
 .../getIsComposableCowChildOrder.ts           |  5 ++
 .../getIsComposableCowParentOrder.ts          |  5 ++
 37 files changed, 335 insertions(+), 157 deletions(-)
 create mode 100644 src/modules/twap/utils/buildTwapOrderParamsStruct.ts
 create mode 100644 src/modules/twap/utils/twapOrderToStruct.ts
 create mode 100644 src/modules/twap/utils/updateTwapOrdersList.ts
 create mode 100644 src/utils/orderUtils/getIsComposableCowChildOrder.ts
 create mode 100644 src/utils/orderUtils/getIsComposableCowParentOrder.ts

diff --git a/src/api/gnosisProtocol/api.ts b/src/api/gnosisProtocol/api.ts
index cbc2e2f204..4c5d97fe23 100644
--- a/src/api/gnosisProtocol/api.ts
+++ b/src/api/gnosisProtocol/api.ts
@@ -1,7 +1,18 @@
-import { OrderBookApiError, PriceQuality, SupportedChainId as ChainId } from '@cowprotocol/cow-sdk'
-import { OrderKind } from '@cowprotocol/cow-sdk'
-import { OrderQuoteRequest, SigningScheme, OrderQuoteResponse, EnrichedOrder } from '@cowprotocol/cow-sdk'
-import { NativePriceResponse, Trade, PartialApiContext, Address } from '@cowprotocol/cow-sdk'
+import {
+  OrderBookApiError,
+  PriceQuality,
+  SupportedChainId as ChainId,
+  CowEnv,
+  OrderKind,
+  OrderQuoteRequest,
+  SigningScheme,
+  OrderQuoteResponse,
+  EnrichedOrder,
+  NativePriceResponse,
+  Trade,
+  PartialApiContext,
+  Address,
+} from '@cowprotocol/cow-sdk'
 
 import { orderBookApi } from 'cowSdk'
 
@@ -140,8 +151,8 @@ export async function getQuote(params: FeeQuoteParams): Promise<OrderQuoteRespon
   })
 }
 
-export async function getOrder(chainId: ChainId, orderId: string): Promise<EnrichedOrder | null> {
-  return orderBookApi.getOrder(orderId, { chainId })
+export async function getOrder(chainId: ChainId, orderId: string, env?: CowEnv): Promise<EnrichedOrder | null> {
+  return orderBookApi.getOrder(orderId, { chainId, env })
 }
 
 export async function getOrders(
diff --git a/src/common/hooks/useCancelOrder/index.ts b/src/common/hooks/useCancelOrder/index.ts
index 560b558a9a..90bd592da4 100644
--- a/src/common/hooks/useCancelOrder/index.ts
+++ b/src/common/hooks/useCancelOrder/index.ts
@@ -49,7 +49,7 @@ export function useCancelOrder(): (order: Order) => UseCancelOrderReturn {
     (order: Order) => {
       // Check the 'cancellability'
 
-      const isEthFlowOrder = getIsEthFlowOrder(order)
+      const isEthFlowOrder = getIsEthFlowOrder(order.inputToken.address)
 
       // 1. EthFlow orders will never be able to be cancelled offChain
       // 2. The wallet must support offChain singing
diff --git a/src/common/hooks/useCancelOrder/onChainCancellation.ts b/src/common/hooks/useCancelOrder/onChainCancellation.ts
index ce0ab54fb0..e888b78fc8 100644
--- a/src/common/hooks/useCancelOrder/onChainCancellation.ts
+++ b/src/common/hooks/useCancelOrder/onChainCancellation.ts
@@ -12,10 +12,17 @@ import { CoWSwapEthFlow } from 'abis/types/ethflow'
 const CANCELLATION_GAS_LIMIT_DEFAULT = BigNumber.from(150000)
 const LOG_LABEL = 'CANCEL ETH FLOW ORDER'
 
+export type CancelledOrderInfo = {
+  txHash: string
+  orderId: string
+  sellTokenAddress: string
+  sellTokenSymbol?: string
+}
+
 export interface OnChainCancellation {
   estimatedGas: BigNumber
 
-  sendTransaction(): Promise<string>
+  sendTransaction(processCancelledOrder: (cancelledOrderInfo: CancelledOrderInfo) => void): Promise<void>
 }
 
 export async function getEthFlowCancellation(
@@ -45,10 +52,17 @@ export async function getEthFlowCancellation(
 
   return {
     estimatedGas,
-    sendTransaction: () => {
+    sendTransaction: (processCancelledOrder) => {
       return ethFlowContract
         .invalidateOrder(cancelOrderParams, { gasLimit: calculateGasMargin(estimatedGas) })
-        .then((res) => res.hash)
+        .then((res) => {
+          processCancelledOrder({
+            txHash: res.hash,
+            orderId: order.id,
+            sellTokenAddress: order.inputToken.address,
+            sellTokenSymbol: order.inputToken.symbol,
+          })
+        })
     },
   }
 }
@@ -67,10 +81,15 @@ export async function getOnChainCancellation(contract: GPv2Settlement, order: Or
 
   return {
     estimatedGas,
-    sendTransaction: () => {
-      return contract
-        .invalidateOrder(cancelOrderParams, { gasLimit: calculateGasMargin(estimatedGas) })
-        .then((res) => res.hash)
+    sendTransaction: (processCancelledOrder) => {
+      return contract.invalidateOrder(cancelOrderParams, { gasLimit: calculateGasMargin(estimatedGas) }).then((res) => {
+        processCancelledOrder({
+          txHash: res.hash,
+          orderId: order.id,
+          sellTokenAddress: order.inputToken.address,
+          sellTokenSymbol: order.inputToken.symbol,
+        })
+      })
     },
   }
 }
diff --git a/src/common/hooks/useCancelOrder/useGetOnChainCancellation.ts b/src/common/hooks/useCancelOrder/useGetOnChainCancellation.ts
index 15dfba235d..c56a755bab 100644
--- a/src/common/hooks/useCancelOrder/useGetOnChainCancellation.ts
+++ b/src/common/hooks/useCancelOrder/useGetOnChainCancellation.ts
@@ -11,6 +11,7 @@ import {
   getOnChainCancellation,
   OnChainCancellation,
 } from 'common/hooks/useCancelOrder/onChainCancellation'
+import { getIsComposableCowParentOrder } from 'utils/orderUtils/getIsComposableCowParentOrder'
 
 export function useGetOnChainCancellation(): (order: Order) => Promise<OnChainCancellation> {
   const ethFlowContract = useEthFlowContract()
@@ -19,13 +20,13 @@ export function useGetOnChainCancellation(): (order: Order) => Promise<OnChainCa
 
   return useCallback(
     (order: Order) => {
-      const composableCowId = order.composableCowInfo?.id
+      const isComposableCowOrder = getIsComposableCowParentOrder(order)
 
-      if (composableCowId) {
-        return cancelTwapOrder(composableCowId)
+      if (isComposableCowOrder) {
+        return cancelTwapOrder(order)
       }
 
-      const isEthFlowOrder = getIsEthFlowOrder(order)
+      const isEthFlowOrder = getIsEthFlowOrder(order.inputToken.address)
 
       if (isEthFlowOrder) {
         return getEthFlowCancellation(ethFlowContract!, order)
diff --git a/src/common/hooks/useCancelOrder/useSendOnChainCancellation.test.ts b/src/common/hooks/useCancelOrder/useSendOnChainCancellation.test.ts
index 133c7a8282..7d301fbed6 100644
--- a/src/common/hooks/useCancelOrder/useSendOnChainCancellation.test.ts
+++ b/src/common/hooks/useCancelOrder/useSendOnChainCancellation.test.ts
@@ -12,6 +12,7 @@ import { useRequestOrderCancellation, useSetOrderCancellationHash } from 'legacy
 import { useWalletInfo } from 'modules/wallet'
 
 import { useSendOnChainCancellation } from './useSendOnChainCancellation'
+
 import { WithMockedWeb3 } from '../../../test-utils'
 
 const chainId = 1
diff --git a/src/common/hooks/useCancelOrder/useSendOnChainCancellation.ts b/src/common/hooks/useCancelOrder/useSendOnChainCancellation.ts
index 93516b7aa9..04c9c5c368 100644
--- a/src/common/hooks/useCancelOrder/useSendOnChainCancellation.ts
+++ b/src/common/hooks/useCancelOrder/useSendOnChainCancellation.ts
@@ -7,6 +7,7 @@ import { useRequestOrderCancellation, useSetOrderCancellationHash } from 'legacy
 import { getIsEthFlowOrder } from 'modules/swap/containers/EthFlowStepper'
 import { useWalletInfo } from 'modules/wallet'
 
+import { CancelledOrderInfo } from './onChainCancellation'
 import { useGetOnChainCancellation } from './useGetOnChainCancellation'
 
 export function useSendOnChainCancellation() {
@@ -16,29 +17,33 @@ export function useSendOnChainCancellation() {
   const addTransaction = useTransactionAdder()
   const getOnChainCancellation = useGetOnChainCancellation()
 
-  return useCallback(
-    async (order: Order) => {
-      if (!chainId) {
-        return
-      }
+  const processCancelledOrder = useCallback(
+    ({ txHash, orderId, sellTokenAddress, sellTokenSymbol }: CancelledOrderInfo) => {
+      if (!chainId) return
 
-      const isEthFlowOrder = getIsEthFlowOrder(order)
-      const { sendTransaction } = await getOnChainCancellation(order)
-
-      const hash = await sendTransaction()
+      const isEthFlowOrder = getIsEthFlowOrder(sellTokenAddress)
 
-      cancelPendingOrder({ id: order.id, chainId })
-      setOrderCancellationHash({ chainId, id: order.id, hash })
+      cancelPendingOrder({ id: orderId, chainId })
+      setOrderCancellationHash({ chainId, id: orderId, hash: txHash })
 
       if (isEthFlowOrder) {
-        addTransaction({ hash, ethFlow: { orderId: order.id, subType: 'cancellation' } })
+        addTransaction({ hash: txHash, ethFlow: { orderId, subType: 'cancellation' } })
       } else {
         addTransaction({
-          hash,
-          onChainCancellation: { orderId: order.id, sellTokenSymbol: order.inputToken.symbol || '' },
+          hash: txHash,
+          onChainCancellation: { orderId, sellTokenSymbol: sellTokenSymbol || '' },
         })
       }
     },
-    [addTransaction, getOnChainCancellation, cancelPendingOrder, chainId, setOrderCancellationHash]
+    [chainId, cancelPendingOrder, setOrderCancellationHash, addTransaction]
+  )
+
+  return useCallback(
+    async (order: Order) => {
+      const { sendTransaction } = await getOnChainCancellation(order)
+
+      await sendTransaction(processCancelledOrder)
+    },
+    [processCancelledOrder, getOnChainCancellation]
   )
 }
diff --git a/src/common/utils/isOrderOffChainCancellable.ts b/src/common/utils/isOrderOffChainCancellable.ts
index edd7870f24..7d3d80f303 100644
--- a/src/common/utils/isOrderOffChainCancellable.ts
+++ b/src/common/utils/isOrderOffChainCancellable.ts
@@ -3,5 +3,5 @@ import { getIsEthFlowOrder } from 'modules/swap/containers/EthFlowStepper'
 import { CancellableOrder, isOrderCancellable } from 'common/utils/isOrderCancellable'
 
 export function isOrderOffChainCancellable(order: CancellableOrder): boolean {
-  return !getIsEthFlowOrder(order) && isOrderCancellable(order)
+  return !getIsEthFlowOrder(order.inputToken.address) && isOrderCancellable(order)
 }
diff --git a/src/legacy/state/orders/reducer.ts b/src/legacy/state/orders/reducer.ts
index d0ecf9fca4..d8f0384ab2 100644
--- a/src/legacy/state/orders/reducer.ts
+++ b/src/legacy/state/orders/reducer.ts
@@ -251,13 +251,17 @@ export default createReducer(initialState, (builder) =>
           popOrder(state, chainId, OrderStatus.FAILED, id)
 
         const validTo = getValidTo(newOrder.apiAdditionalInfo, newOrder)
+        const isComposableCowOrder = !!orderObj?.order?.composableCowInfo
         // merge existing and new order objects
         const order = orderObj
           ? {
               ...orderObj.order,
               validTo,
               apiAdditionalInfo: newOrder.apiAdditionalInfo,
-              isCancelling: newOrder.isCancelling,
+              // Don't reset isCancelling status for ComposableCow orders
+              // Because currently we don't have a backend for it
+              // And this status is stored only on Frontend
+              isCancelling: isComposableCowOrder ? !!orderObj.order.isCancelling : newOrder.isCancelling,
               class: newOrder.class,
               openSince: newOrder.openSince || orderObj.order.openSince,
               status,
diff --git a/src/legacy/state/orders/updaters/utils.ts b/src/legacy/state/orders/updaters/utils.ts
index 31c9c8862c..1f10db5d4a 100644
--- a/src/legacy/state/orders/updaters/utils.ts
+++ b/src/legacy/state/orders/updaters/utils.ts
@@ -8,6 +8,8 @@ import { stringToCurrency } from 'legacy/state/swap/extension'
 import { getOrder, OrderID } from 'api/gnosisProtocol'
 import { formatTokenAmount } from 'utils/amountFormat'
 import { formatSymbol } from 'utils/format'
+import { getIsComposableCowChildOrder } from 'utils/orderUtils/getIsComposableCowChildOrder'
+import { getIsComposableCowParentOrder } from 'utils/orderUtils/getIsComposableCowParentOrder'
 
 export type OrderLogPopupMixData = OrderFulfillmentData | OrderID
 
@@ -65,10 +67,16 @@ export async function fetchOrderPopupData(orderFromStore: Order, chainId: ChainI
   if (orderFromStore.status === OrderStatus.CREATING) {
     return null
   }
+  // Skip ComposableCow orders
+  if (getIsComposableCowParentOrder(orderFromStore)) {
+    return null
+  }
   // Get order from API
   let orderFromApi: EnrichedOrder | null = null
   try {
-    orderFromApi = await getOrder(chainId, orderFromStore.id)
+    const isComposableCowChildOrder = getIsComposableCowChildOrder(orderFromStore)
+    // For ComposableCow child orders always request PROD order-book
+    orderFromApi = await getOrder(chainId, orderFromStore.id, isComposableCowChildOrder ? 'prod' : undefined)
   } catch (e: any) {
     console.debug(
       `[PendingOrdersUpdater] Failed to fetch order popup data on chain ${chainId} for order ${orderFromStore.id}`
diff --git a/src/modules/ordersTable/pure/OrderStatusBox/index.tsx b/src/modules/ordersTable/pure/OrderStatusBox/index.tsx
index ce0df2e3af..eb7f136326 100644
--- a/src/modules/ordersTable/pure/OrderStatusBox/index.tsx
+++ b/src/modules/ordersTable/pure/OrderStatusBox/index.tsx
@@ -16,10 +16,10 @@ const Wrapper = styled.div<{
 }>`
   --height: 28px;
   --statusColor: ${({ theme, status, cancelling, partiallyFilled }) =>
-    cancelling
-      ? theme.text1
-      : status === OrderStatus.CANCELLED
+    status === OrderStatus.CANCELLED
       ? theme.danger
+      : cancelling
+      ? theme.text1
       : status === OrderStatus.FULFILLED || partiallyFilled
       ? theme.success
       : status === OrderStatus.PENDING // OPEN order
@@ -60,6 +60,32 @@ const Wrapper = styled.div<{
   }
 `
 
+function getOrderStatusTitle(order: ParsedOrder): string {
+  // Cancelled status takes precedence
+  if (order.status === OrderStatus.CANCELLED) {
+    return orderStatusTitleMap[order.status]
+  }
+
+  // Cancelling is not a real order status
+  if (order.isCancelling) {
+    return 'Cancelling...'
+  }
+
+  // We consider the order fully filled for display purposes even if not 100% filled
+  // For this reason we use the flag to override the order status
+  if (order.executionData.fullyFilled) {
+    return orderStatusTitleMap[OrderStatus.FULFILLED]
+  }
+
+  // Partially filled is also not a real status
+  if (order.executionData.partiallyFilled) {
+    return 'Partially Filled'
+  }
+
+  // Finally, map order status to their display version
+  return orderStatusTitleMap[order.status]
+}
+
 export type OrderStatusBoxProps = {
   order: ParsedOrder
   widthAuto?: boolean
@@ -79,22 +105,7 @@ export function OrderStatusBox({ order, widthAuto, withWarning, onClick }: Order
       onClick={onClick}
     >
       {/* Status overrides for special cases */}
-      {
-        // Cancelling is not a real order status
-        order.isCancelling
-          ? 'Cancelling...'
-          : // Cancelled status takes precedence
-          order.status === OrderStatus.CANCELLED
-          ? orderStatusTitleMap[order.status]
-          : // We consider the order fully filled for display purposes even if not 100% filled
-          // For this reason we use the flag to override the order status
-          order.executionData.fullyFilled
-          ? orderStatusTitleMap[OrderStatus.FULFILLED]
-          : // Partially filled is also not a real status
-          order.executionData.partiallyFilled
-          ? 'Partially Filled'
-          : orderStatusTitleMap[order.status] // Finally, map order status to their display version
-      }
+      {getOrderStatusTitle(order)}
     </Wrapper>
   )
 }
diff --git a/src/modules/ordersTable/pure/OrdersTableContainer/OrderRow/index.tsx b/src/modules/ordersTable/pure/OrdersTableContainer/OrderRow/index.tsx
index 325df5d4e9..eb6793ca4a 100644
--- a/src/modules/ordersTable/pure/OrdersTableContainer/OrderRow/index.tsx
+++ b/src/modules/ordersTable/pure/OrdersTableContainer/OrderRow/index.tsx
@@ -183,7 +183,7 @@ export function OrderRow({
           <TableRowCheckbox
             type="checkbox"
             checked={isRowSelected}
-            disabled={getIsEthFlowOrder(order) || !isOrderCancellable(order)}
+            disabled={getIsEthFlowOrder(order.inputToken.address) || !isOrderCancellable(order)}
             onChange={() => orderActions.toggleOrderForCancellation(order)}
           />
           <CheckboxCheckmark />
diff --git a/src/modules/swap/containers/EthFlowStepper/index.tsx b/src/modules/swap/containers/EthFlowStepper/index.tsx
index 47ff95c0f7..e685f0d5a9 100644
--- a/src/modules/swap/containers/EthFlowStepper/index.tsx
+++ b/src/modules/swap/containers/EthFlowStepper/index.tsx
@@ -1,5 +1,3 @@
-import { Token } from '@uniswap/sdk-core'
-
 import { NATIVE_CURRENCY_BUY_ADDRESS } from 'legacy/constants'
 import { useAllTransactions } from 'legacy/state/enhancedTransactions/hooks'
 import { EnhancedTransactionDetails } from 'legacy/state/enhancedTransactions/reducer'
@@ -34,7 +32,7 @@ export function EthFlowStepper(props: EthFlowStepperProps) {
 
   const state = mapOrderToEthFlowStepperState(order, creationTx, cancellationTx)
 
-  const isEthFlowOrder = getIsEthFlowOrder(order)
+  const isEthFlowOrder = getIsEthFlowOrder(order?.inputToken.address || '')
 
   if (!order || !state || !isEthFlowOrder) {
     return null
@@ -119,6 +117,6 @@ function didRefundFail(order: Order): boolean | undefined {
 }
 
 // TODO: move this somewhere else?
-export function getIsEthFlowOrder(order: { inputToken: Token } | undefined): boolean {
-  return order?.inputToken.address === NATIVE_CURRENCY_BUY_ADDRESS
+export function getIsEthFlowOrder(inputTokenAddress: string): boolean {
+  return inputTokenAddress === NATIVE_CURRENCY_BUY_ADDRESS
 }
diff --git a/src/modules/swap/services/types.ts b/src/modules/swap/services/types.ts
index fff1849f59..e10afd2f56 100644
--- a/src/modules/swap/services/types.ts
+++ b/src/modules/swap/services/types.ts
@@ -15,6 +15,7 @@ import { SwapFlowAnalyticsContext } from 'modules/trade/utils/analytics'
 
 import { GPv2Settlement } from 'abis/types'
 import { CoWSwapEthFlow } from 'abis/types/ethflow'
+
 import { FlowType } from '../hooks/useFlowContext'
 
 export interface BaseFlowContext {
diff --git a/src/modules/twap/const.ts b/src/modules/twap/const.ts
index 2285da8fb5..714b4f57f8 100644
--- a/src/modules/twap/const.ts
+++ b/src/modules/twap/const.ts
@@ -32,5 +32,4 @@ export const TWAP_HANDLER_ADDRESS: Record<SupportedChainId, string> = {
   5: '0xa12d770028d7072b80baeb6a1df962374fd13d9a',
 }
 
-// TODO: Add filled status
-export const TWAP_NOT_PENDING_STATUSES = [TwapOrderStatus.Cancelled, TwapOrderStatus.Expired]
+export const TWAP_PENDING_STATUSES = [TwapOrderStatus.WaitSigning, TwapOrderStatus.Pending, TwapOrderStatus.Scheduled]
diff --git a/src/modules/twap/hooks/useCancelTwapOrder.ts b/src/modules/twap/hooks/useCancelTwapOrder.ts
index a3ab16348e..eff3fda6b4 100644
--- a/src/modules/twap/hooks/useCancelTwapOrder.ts
+++ b/src/modules/twap/hooks/useCancelTwapOrder.ts
@@ -1,26 +1,31 @@
 import { useAtomValue } from 'jotai/utils'
 import { useCallback } from 'react'
 
-import { BigNumber } from '@ethersproject/bignumber'
-
 import { useGP2SettlementContract } from 'legacy/hooks/useContract'
+import { Order } from 'legacy/state/orders/actions'
 
 import { useComposableCowContract } from 'modules/advancedOrders/hooks/useComposableCowContract'
 import { useSafeAppsSdk } from 'modules/wallet/web3-react/hooks/useSafeAppsSdk'
 
+import type { OnChainCancellation } from 'common/hooks/useCancelOrder/onChainCancellation'
+
 import { cancelTwapOrderTxs, estimateCancelTwapOrderTxs } from '../services/cancelTwapOrderTxs'
 import { twapPartOrdersListAtom } from '../state/twapPartOrdersAtom'
 
-type TwapCancellation = { estimatedGas: BigNumber; sendTransaction(): Promise<string> }
-
-export function useCancelTwapOrder(): (orderId: string) => Promise<TwapCancellation> {
+export function useCancelTwapOrder(): (order: Order) => Promise<OnChainCancellation> {
   const twapPartOrders = useAtomValue(twapPartOrdersListAtom)
   const safeAppsSdk = useSafeAppsSdk()
   const settlementContract = useGP2SettlementContract()
   const composableCowContract = useComposableCowContract()
 
   return useCallback(
-    async (orderId: string) => {
+    async (order: Order) => {
+      const orderId = order.composableCowInfo?.id
+
+      if (!orderId) {
+        throw new Error('Wrong orderId for TWAP order cancellation')
+      }
+
       if (!composableCowContract || !settlementContract || !safeAppsSdk) {
         throw new Error('Context is not full to cancel TWAP order')
       }
@@ -32,8 +37,18 @@ export function useCancelTwapOrder(): (orderId: string) => Promise<TwapCancellat
 
       return {
         estimatedGas: await estimateCancelTwapOrderTxs(context),
-        sendTransaction: () => {
-          return safeAppsSdk.txs.send({ txs: cancelTwapOrderTxs(context) }).then((res) => res.safeTxHash)
+        sendTransaction: (processCancelledOrder) => {
+          return safeAppsSdk.txs.send({ txs: cancelTwapOrderTxs(context) }).then((res) => {
+            const txHash = res.safeTxHash
+            const sellTokenAddress = order.inputToken.address
+            const sellTokenSymbol = order.inputToken.symbol
+
+            processCancelledOrder({ txHash, orderId, sellTokenAddress, sellTokenSymbol })
+
+            if (partOrderId) {
+              processCancelledOrder({ txHash, orderId: partOrderId, sellTokenAddress, sellTokenSymbol })
+            }
+          })
         },
       }
     },
diff --git a/src/modules/twap/hooks/useCreateTwapOrder.ts b/src/modules/twap/hooks/useCreateTwapOrder.ts
index fe58c5c259..441f38ed53 100644
--- a/src/modules/twap/hooks/useCreateTwapOrder.ts
+++ b/src/modules/twap/hooks/useCreateTwapOrder.ts
@@ -1,4 +1,5 @@
 import { useAtomValue } from 'jotai'
+import { useUpdateAtom } from 'jotai/utils'
 import { useCallback } from 'react'
 
 import { CurrencyAmount, Token } from '@uniswap/sdk-core'
@@ -8,14 +9,22 @@ import { Nullish } from 'types'
 
 import { useAdvancedOrdersDerivedState } from 'modules/advancedOrders'
 import { useTradeConfirmActions } from 'modules/trade'
+import { useWalletInfo } from 'modules/wallet'
 
 import { useTwapOrderCreationContext } from './useTwapOrderCreationContext'
 
 import { settleTwapOrder } from '../services/settleTwapOrder'
 import { twapOrderAtom } from '../state/twapOrderAtom'
+import { addTwapOrderToListAtom } from '../state/twapOrdersListAtom'
+import { TwapOrderStatus } from '../types'
+import { buildTwapOrderParamsStruct } from '../utils/buildTwapOrderParamsStruct'
+import { getConditionalOrderId } from '../utils/getConditionalOrderId'
+import { twapOrderToStruct } from '../utils/twapOrderToStruct'
 
 export function useCreateTwapOrder() {
+  const { chainId, account } = useWalletInfo()
   const twapOrder = useAtomValue(twapOrderAtom)
+  const addTwapOrderToList = useUpdateAtom(addTwapOrderToListAtom)
 
   const { inputCurrencyAmount, outputCurrencyAmount } = useAdvancedOrdersDerivedState()
 
@@ -24,6 +33,7 @@ export function useCreateTwapOrder() {
   const tradeConfirmActions = useTradeConfirmActions()
 
   return useCallback(async () => {
+    if (!chainId || !account) return
     if (!inputCurrencyAmount || !outputCurrencyAmount || !twapOrderCreationContext || !twapOrder) return
 
     const pendingTrade = {
@@ -32,15 +42,36 @@ export function useCreateTwapOrder() {
     }
 
     const startTime = Math.round((Date.now() + ms`1m`) / 1000) // Now + 1 min
+    const twapOrderWithStartTime = { ...twapOrder, startTime }
+    const paramsStruct = buildTwapOrderParamsStruct(chainId, twapOrderWithStartTime)
+    const orderId = getConditionalOrderId(paramsStruct)
 
     tradeConfirmActions.onSign(pendingTrade)
 
     try {
-      const { safeTxHash } = await settleTwapOrder({ ...twapOrder, startTime }, twapOrderCreationContext)
+      const { safeTxHash } = await settleTwapOrder(twapOrderWithStartTime, paramsStruct, twapOrderCreationContext)
+
+      addTwapOrderToList({
+        order: twapOrderToStruct(twapOrder),
+        status: TwapOrderStatus.WaitSigning,
+        chainId,
+        safeAddress: account,
+        submissionDate: new Date().toISOString(),
+        id: orderId,
+      })
 
       tradeConfirmActions.onSuccess(safeTxHash)
     } catch (error) {
       tradeConfirmActions.onError(error.message || error)
     }
-  }, [inputCurrencyAmount, outputCurrencyAmount, twapOrder, tradeConfirmActions, twapOrderCreationContext])
+  }, [
+    chainId,
+    account,
+    inputCurrencyAmount,
+    outputCurrencyAmount,
+    twapOrder,
+    tradeConfirmActions,
+    twapOrderCreationContext,
+    addTwapOrderToList,
+  ])
 }
diff --git a/src/modules/twap/hooks/useFetchTwapPartOrders.ts b/src/modules/twap/hooks/useFetchTwapPartOrders.ts
index 4c60c7066c..7e3e963b76 100644
--- a/src/modules/twap/hooks/useFetchTwapPartOrders.ts
+++ b/src/modules/twap/hooks/useFetchTwapPartOrders.ts
@@ -74,7 +74,7 @@ async function getTwapPartOrderItem(
     sellAmount: partOrder.sellAmount.toString(),
     buyAmount: partOrder.buyAmount.toString(),
     feeAmount: partOrder.feeAmount.toString(),
-    kind: 'sell', // TODO: discuss it, smart-contract returns bytes here
+    kind: 'sell', // Twap order is always sell
     partiallyFillable: partOrder.partiallyFillable,
   } as Order
 
diff --git a/src/modules/twap/hooks/useTwapOrderCreationContext.ts b/src/modules/twap/hooks/useTwapOrderCreationContext.ts
index 486b15cb3a..e6414d0235 100644
--- a/src/modules/twap/hooks/useTwapOrderCreationContext.ts
+++ b/src/modules/twap/hooks/useTwapOrderCreationContext.ts
@@ -1,4 +1,3 @@
-import { SupportedChainId } from '@cowprotocol/cow-sdk'
 import SafeAppsSDK from '@safe-global/safe-apps-sdk'
 import { CurrencyAmount, Token } from '@uniswap/sdk-core'
 
@@ -8,7 +7,6 @@ import { Erc20 } from 'legacy/abis/types'
 import { useTokenContract } from 'legacy/hooks/useContract'
 
 import { useComposableCowContract } from 'modules/advancedOrders/hooks/useComposableCowContract'
-import { useWalletInfo } from 'modules/wallet'
 import { useSafeAppsSdk } from 'modules/wallet/web3-react/hooks/useSafeAppsSdk'
 
 import { ComposableCoW } from 'abis/types'
@@ -16,7 +14,6 @@ import { useNeedsApproval } from 'common/hooks/useNeedsApproval'
 import { useTradeSpenderAddress } from 'common/hooks/useTradeSpenderAddress'
 
 export interface TwapOrderCreationContext {
-  chainId: SupportedChainId
   safeAppsSdk: SafeAppsSDK
   composableCowContract: ComposableCoW
   needsApproval: boolean
@@ -27,14 +24,13 @@ export interface TwapOrderCreationContext {
 export function useTwapOrderCreationContext(
   inputAmount: Nullish<CurrencyAmount<Token>>
 ): TwapOrderCreationContext | null {
-  const { chainId } = useWalletInfo()
   const safeAppsSdk = useSafeAppsSdk()
   const composableCowContract = useComposableCowContract()
   const needsApproval = useNeedsApproval(inputAmount)
   const erc20Contract = useTokenContract(inputAmount?.currency.address)
   const spender = useTradeSpenderAddress()
 
-  if (!composableCowContract || !erc20Contract || !chainId || !safeAppsSdk || !spender) return null
+  if (!composableCowContract || !erc20Contract || !safeAppsSdk || !spender) return null
 
-  return { chainId, safeAppsSdk, composableCowContract, erc20Contract, needsApproval, spender }
+  return { safeAppsSdk, composableCowContract, erc20Contract, needsApproval, spender }
 }
diff --git a/src/modules/twap/hooks/useTwapOrdersAuthMulticall.ts b/src/modules/twap/hooks/useTwapOrdersAuthMulticall.ts
index a4a14ba887..722d786c81 100644
--- a/src/modules/twap/hooks/useTwapOrdersAuthMulticall.ts
+++ b/src/modules/twap/hooks/useTwapOrdersAuthMulticall.ts
@@ -21,12 +21,12 @@ export function useTwapOrdersAuthMulticall(
   const results = useSingleContractMultipleData(composableCowContract, 'singleOrders', input, DEFAULT_LISTENER_OPTIONS)
 
   return useMemo(() => {
-    const loadedResults = results.filter((result) => !result.loading)
+    const loadedResults = results.filter((result) => !result.loading && result.valid)
 
     if (loadedResults.length !== ordersInfo.length) return null
 
     return ordersInfo.reduce((acc, val, index) => {
-      acc[val.id] = !!loadedResults[index].result?.[0]
+      acc[val.id] = loadedResults[index].result?.[0]
       return acc
     }, {} as TwapOrdersAuthResult)
   }, [ordersInfo, results])
diff --git a/src/modules/twap/pure/PrimaryActionButton/getTwapFormState.tsx b/src/modules/twap/pure/PrimaryActionButton/getTwapFormState.tsx
index 0e598b2546..1b7a263e1d 100644
--- a/src/modules/twap/pure/PrimaryActionButton/getTwapFormState.tsx
+++ b/src/modules/twap/pure/PrimaryActionButton/getTwapFormState.tsx
@@ -10,7 +10,7 @@ export interface TwapFormStateParams {
 export enum TwapFormState {
   LOADING_SAFE_INFO,
   NOT_SAFE,
-  ORDER_NOT_SPECIFIED, // TODO: reveal details
+  ORDER_NOT_SPECIFIED,
   NEED_FALLBACK_HANDLER,
   CAN_CREATE_ORDER,
 }
diff --git a/src/modules/twap/pure/PrimaryActionButton/index.tsx b/src/modules/twap/pure/PrimaryActionButton/index.tsx
index d82a740e12..a6f99a75ff 100644
--- a/src/modules/twap/pure/PrimaryActionButton/index.tsx
+++ b/src/modules/twap/pure/PrimaryActionButton/index.tsx
@@ -10,7 +10,6 @@ export interface PrimaryActionButtonContext {
   setFallbackHandler(): void
 }
 
-// TODO: extend with common trade widget states
 // TODO: set correct buttons text
 const buttonsMap: Record<TwapFormState, (context: PrimaryActionButtonContext) => JSX.Element> = {
   [TwapFormState.LOADING_SAFE_INFO]: () => (
diff --git a/src/modules/twap/services/createTwapOrderTxs.test.ts b/src/modules/twap/services/createTwapOrderTxs.test.ts
index 1b758d086a..93ec86f47e 100644
--- a/src/modules/twap/services/createTwapOrderTxs.test.ts
+++ b/src/modules/twap/services/createTwapOrderTxs.test.ts
@@ -1,12 +1,17 @@
 import { SupportedChainId } from '@cowprotocol/cow-sdk'
 import { CurrencyAmount } from '@uniswap/sdk-core'
 
+import { COW } from 'legacy/constants/tokens'
+import { WETH_GOERLI } from 'legacy/utils/goerli/constants'
+
 import { createTwapOrderTxs } from './createTwapOrderTxs'
 
-import { COW } from '../../../legacy/constants/tokens'
-import { WETH_GOERLI } from '../../../legacy/utils/goerli/constants'
+import { COMPOSABLE_COW_ADDRESS } from '../../advancedOrders'
 import { TwapOrderCreationContext } from '../hooks/useTwapOrderCreationContext'
 import { TWAPOrder } from '../types'
+import { buildTwapOrderParamsStruct } from '../utils/buildTwapOrderParamsStruct'
+
+const chainId = SupportedChainId.GOERLI
 
 const order: TWAPOrder = {
   sellAmount: CurrencyAmount.fromRawAmount(COW[SupportedChainId.GOERLI], 100_000_000_000),
@@ -33,9 +38,11 @@ describe('Create TWAP order', () => {
     approveFn = jest.fn().mockReturnValue(APPROVE_TX_DATA)
 
     context = {
-      chainId: SupportedChainId.GOERLI,
       safeAppsSdk: null as any,
-      composableCowContract: { interface: { encodeFunctionData: createCowFn } } as any,
+      composableCowContract: {
+        interface: { encodeFunctionData: createCowFn },
+        address: COMPOSABLE_COW_ADDRESS[chainId],
+      } as any,
       needsApproval: false,
       spender: '0xB4FBF271143F4FBf7B91A5ded31805e42b222222',
       erc20Contract: { interface: { encodeFunctionData: approveFn } } as any,
@@ -43,7 +50,8 @@ describe('Create TWAP order', () => {
   })
 
   it('When sell token is approved, then should generate only creation transaction', () => {
-    const result = createTwapOrderTxs(order, { ...context, needsApproval: false })
+    const paramsStruct = buildTwapOrderParamsStruct(chainId, order)
+    const result = createTwapOrderTxs(order, paramsStruct, { ...context, needsApproval: false })
 
     expect(createCowFn).toHaveBeenCalledTimes(1)
     expect(createCowFn.mock.calls[0]).toMatchSnapshot()
@@ -53,7 +61,8 @@ describe('Create TWAP order', () => {
   })
 
   it('When sell token is NOT approved, then should generate approval and creation transactions', () => {
-    const result = createTwapOrderTxs(order, { ...context, needsApproval: true })
+    const paramsStruct = buildTwapOrderParamsStruct(chainId, order)
+    const result = createTwapOrderTxs(order, paramsStruct, { ...context, needsApproval: true })
 
     expect(createCowFn).toHaveBeenCalledTimes(1)
     expect(createCowFn.mock.calls[0]).toMatchSnapshot()
diff --git a/src/modules/twap/services/createTwapOrderTxs.ts b/src/modules/twap/services/createTwapOrderTxs.ts
index ed6d12c8bf..d734f6de52 100644
--- a/src/modules/twap/services/createTwapOrderTxs.ts
+++ b/src/modules/twap/services/createTwapOrderTxs.ts
@@ -1,51 +1,21 @@
-import { SupportedChainId } from '@cowprotocol/cow-sdk'
-import { defaultAbiCoder } from '@ethersproject/abi'
-import { hexZeroPad } from '@ethersproject/bytes'
 import { MetaTransactionData } from '@safe-global/safe-core-sdk-types'
 
-import { COMPOSABLE_COW_ADDRESS } from 'modules/advancedOrders'
-
-import { IConditionalOrder } from 'abis/types/ComposableCoW'
-
-import { TWAP_HANDLER_ADDRESS, TWAP_ORDER_STRUCT } from '../const'
 import { TwapOrderCreationContext } from '../hooks/useTwapOrderCreationContext'
-import { TWAPOrder, TWAPOrderStruct } from '../types'
-
-function getTwapOrderParamsStruct(
-  chainId: SupportedChainId,
-  order: TWAPOrder
-): IConditionalOrder.ConditionalOrderParamsStruct {
-  const twapOrderData: TWAPOrderStruct = {
-    sellToken: order.sellAmount.currency.address,
-    buyToken: order.buyAmount.currency.address,
-    receiver: order.receiver,
-    partSellAmount: order.sellAmount.divide(order.numOfParts).quotient.toString(),
-    minPartLimit: order.buyAmount.divide(order.numOfParts).quotient.toString(),
-    t0: order.startTime,
-    n: order.numOfParts,
-    t: order.timeInterval,
-    span: order.span,
-  }
+import { ConditionalOrderParams, TWAPOrder } from '../types'
 
-  return {
-    handler: TWAP_HANDLER_ADDRESS[chainId],
-    salt: hexZeroPad(Buffer.from(Date.now().toString(16), 'hex'), 32),
-    staticInput: defaultAbiCoder.encode([TWAP_ORDER_STRUCT], [twapOrderData]),
-  }
-}
-
-export function createTwapOrderTxs(order: TWAPOrder, context: TwapOrderCreationContext): MetaTransactionData[] {
-  const { chainId, composableCowContract, needsApproval, erc20Contract, spender } = context
+export function createTwapOrderTxs(
+  order: TWAPOrder,
+  paramsStruct: ConditionalOrderParams,
+  context: TwapOrderCreationContext
+): MetaTransactionData[] {
+  const { composableCowContract, needsApproval, erc20Contract, spender } = context
 
   const sellTokenAddress = order.sellAmount.currency.address
   const sellAmountAtoms = order.sellAmount.quotient.toString()
 
-  // TODO: support other conditional orders (stop loss, GAT, etc.)
-  const creationParams = getTwapOrderParamsStruct(chainId, order)
-
   const createOrderTx = {
-    to: COMPOSABLE_COW_ADDRESS[chainId],
-    data: composableCowContract.interface.encodeFunctionData('create', [creationParams, true]),
+    to: composableCowContract.address,
+    data: composableCowContract.interface.encodeFunctionData('create', [paramsStruct, true]),
     value: '0',
     operation: 0,
   }
diff --git a/src/modules/twap/services/fetchTwapOrdersFromSafe.ts b/src/modules/twap/services/fetchTwapOrdersFromSafe.ts
index 48356bb848..40dc8017db 100644
--- a/src/modules/twap/services/fetchTwapOrdersFromSafe.ts
+++ b/src/modules/twap/services/fetchTwapOrdersFromSafe.ts
@@ -10,6 +10,7 @@ import { ConditionalOrderParams } from '../types'
 export interface TwapOrdersSafeData {
   params: ConditionalOrderParams
   submissionDate: string
+  executionDate: string
   isExecuted: boolean
 }
 
@@ -38,10 +39,13 @@ export async function fetchTwapOrdersFromSafe(
 
       if (!params) return null
 
+      const { isExecuted, submissionDate, executionDate } = result
+
       return {
         params,
-        isExecuted: result.isExecuted,
-        submissionDate: result.submissionDate,
+        isExecuted,
+        submissionDate,
+        executionDate,
       }
     })
     .filter(isTruthy)
diff --git a/src/modules/twap/services/settleTwapOrder.test.ts b/src/modules/twap/services/settleTwapOrder.test.ts
index 6c72905082..8045d79570 100644
--- a/src/modules/twap/services/settleTwapOrder.test.ts
+++ b/src/modules/twap/services/settleTwapOrder.test.ts
@@ -19,8 +19,10 @@ import { useTradeSpenderAddress } from 'common/hooks/useTradeSpenderAddress'
 
 import { settleTwapOrder } from './settleTwapOrder'
 
+import { COMPOSABLE_COW_ADDRESS } from '../../advancedOrders'
 import { useTwapOrderCreationContext } from '../hooks/useTwapOrderCreationContext'
 import { TWAPOrder } from '../types'
+import { buildTwapOrderParamsStruct } from '../utils/buildTwapOrderParamsStruct'
 
 jest.mock('modules/wallet/web3-react/hooks/useSafeAppsSdk')
 jest.mock('modules/advancedOrders/hooks/useComposableCowContract')
@@ -39,6 +41,9 @@ const order: TWAPOrder = {
   timeInterval: 350,
   span: 0,
 }
+
+const paramsStruct = buildTwapOrderParamsStruct(chainId, order)
+
 const useSafeAppsSdkMock = useSafeAppsSdk as jest.MockedFunction<typeof useSafeAppsSdk>
 const useComposableCowContractMock = useComposableCowContract as jest.MockedFunction<typeof useComposableCowContract>
 const useNeedsApprovalMock = useNeedsApproval as jest.MockedFunction<typeof useNeedsApproval>
@@ -52,6 +57,7 @@ describe('settleTwapOrder - integration test', () => {
     useSafeAppsSdkMock.mockReturnValue({ txs: { send: () => Promise.resolve({ safeTxHash: '0x00b' }) } } as any)
     useComposableCowContractMock.mockReturnValue({
       interface: { encodeFunctionData: () => '0xCREATE_COW_TX_DATA' },
+      address: COMPOSABLE_COW_ADDRESS[chainId],
     } as any)
     useNeedsApprovalMock.mockReturnValue(true)
     useTokenContractMock.mockReturnValue({ interface: { encodeFunctionData: () => '0xAPPROVE_TX_DATA' } } as any)
@@ -70,7 +76,7 @@ describe('settleTwapOrder - integration test', () => {
 
       if (!context) return null
 
-      return settleTwapOrder(order, context)
+      return settleTwapOrder(order, paramsStruct, context)
     })
 
     expect(await result.current).toEqual({ safeTxHash: '0x00b' })
diff --git a/src/modules/twap/services/settleTwapOrder.ts b/src/modules/twap/services/settleTwapOrder.ts
index e58df7fcd4..e11efa71b6 100644
--- a/src/modules/twap/services/settleTwapOrder.ts
+++ b/src/modules/twap/services/settleTwapOrder.ts
@@ -3,20 +3,16 @@ import { SendTransactionsResponse } from '@safe-global/safe-apps-sdk'
 import { createTwapOrderTxs } from './createTwapOrderTxs'
 
 import { TwapOrderCreationContext } from '../hooks/useTwapOrderCreationContext'
-import { TWAPOrder } from '../types'
+import { ConditionalOrderParams, TWAPOrder } from '../types'
 
 export async function settleTwapOrder(
   order: TWAPOrder,
+  paramsStruct: ConditionalOrderParams,
   context: TwapOrderCreationContext
 ): Promise<SendTransactionsResponse> {
   const { safeAppsSdk } = context
 
-  const txs = createTwapOrderTxs(order, context)
+  const txs = createTwapOrderTxs(order, paramsStruct, context)
 
-  const response = await safeAppsSdk.txs.send({ txs })
-
-  // TODO: process the sent transaction
-  console.log('TWAP order: ', response)
-
-  return response
+  return await safeAppsSdk.txs.send({ txs })
 }
diff --git a/src/modules/twap/state/twapOrdersListAtom.ts b/src/modules/twap/state/twapOrdersListAtom.ts
index c1168ef674..43533bb153 100644
--- a/src/modules/twap/state/twapOrdersListAtom.ts
+++ b/src/modules/twap/state/twapOrdersListAtom.ts
@@ -9,6 +9,7 @@ import { deepEqual } from 'utils/deepEqual'
 
 import { TwapOrderItem } from '../types'
 import { emulateTwapAsOrder } from '../utils/emulateTwapAsOrder'
+import { updateTwapOrdersList } from '../utils/updateTwapOrdersList'
 
 export type TwapOrdersList = { [key: string]: TwapOrderItem }
 
@@ -16,12 +17,19 @@ export const twapOrdersListAtom = atomWithStorage<TwapOrdersList>('twap-orders-l
 
 export const updateTwapOrdersListAtom = atom(null, (get, set, nextState: TwapOrdersList) => {
   const currentState = get(twapOrdersListAtom)
+  const newState = updateTwapOrdersList(currentState, nextState)
 
-  if (!deepEqual(currentState, nextState)) {
-    set(twapOrdersListAtom, nextState)
+  if (!deepEqual(currentState, newState)) {
+    set(twapOrdersListAtom, newState)
   }
 })
 
+export const addTwapOrderToListAtom = atom(null, (get, set, order: TwapOrderItem) => {
+  const currentState = get(twapOrdersListAtom)
+
+  set(twapOrdersListAtom, { ...currentState, [order.id]: order })
+})
+
 export const emulatedTwapOrdersAtom = atom((get) => {
   const { account, chainId } = get(walletInfoAtom)
   const tokens = get(tokensByAddressAtom)
diff --git a/src/modules/twap/state/twapPartOrdersAtom.ts b/src/modules/twap/state/twapPartOrdersAtom.ts
index d26582ed92..bba7770079 100644
--- a/src/modules/twap/state/twapPartOrdersAtom.ts
+++ b/src/modules/twap/state/twapPartOrdersAtom.ts
@@ -27,7 +27,7 @@ export const updateTwapPartOrdersAtom = atom(null, (get, set, nextState: TwapPar
   }
 })
 
-export const twapPartOrdersListAtom = atom((get) => {
+export const twapPartOrdersListAtom = atom<TwapPartOrderItem[]>((get) => {
   const { account, chainId } = get(walletInfoAtom)
 
   if (!account || !chainId) return []
diff --git a/src/modules/twap/types.ts b/src/modules/twap/types.ts
index b974ede035..61d1cf02f9 100644
--- a/src/modules/twap/types.ts
+++ b/src/modules/twap/types.ts
@@ -59,4 +59,4 @@ export interface TwapOrderInfo {
   isExpired: boolean
 }
 
-export type TwapOrdersAuthResult = { [key: string]: boolean }
+export type TwapOrdersAuthResult = { [key: string]: boolean | undefined }
diff --git a/src/modules/twap/updaters/TwapOrdersUpdater.tsx b/src/modules/twap/updaters/TwapOrdersUpdater.tsx
index 209b00fe48..e9200e724a 100644
--- a/src/modules/twap/updaters/TwapOrdersUpdater.tsx
+++ b/src/modules/twap/updaters/TwapOrdersUpdater.tsx
@@ -5,7 +5,7 @@ import { SupportedChainId } from '@cowprotocol/cow-sdk'
 
 import { ComposableCoW } from 'abis/types'
 
-import { TWAP_NOT_PENDING_STATUSES } from '../const'
+import { TWAP_PENDING_STATUSES } from '../const'
 import { useFetchTwapOrdersFromSafe } from '../hooks/useFetchTwapOrdersFromSafe'
 import { useFetchTwapPartOrders } from '../hooks/useFetchTwapPartOrders'
 import { useTwapDiscreteOrders } from '../hooks/useTwapDiscreteOrders'
@@ -46,21 +46,21 @@ export function TwapOrdersUpdater(props: {
   }, [ordersSafeData])
 
   // Here we can split all orders in two groups: 1. Not signed + expired, 2. Open + cancelled
-  const openOrCancelledOrders = useMemo(() => {
+  const pendingOrCancelledOrders = useMemo(() => {
     return allOrdersInfo.filter((info) => {
-      const existedOrder = twapOrdersList[info.id]
+      const existingOrder = twapOrdersList[info.id]
 
-      if (existedOrder) {
-        return !TWAP_NOT_PENDING_STATUSES.includes(existedOrder.status)
+      if (existingOrder) {
+        return TWAP_PENDING_STATUSES.includes(existingOrder.status)
       }
 
       return !info.isExpired && info.safeData.isExecuted
     })
   }, [allOrdersInfo, twapOrdersList])
 
-  const partOrders = useFetchTwapPartOrders(safeAddress, chainId, composableCowContract, openOrCancelledOrders)
-  // Here we know which orders are cancelled: if it's auth !== true, then it's cancelled
-  const ordersAuthResult = useTwapOrdersAuthMulticall(safeAddress, composableCowContract, openOrCancelledOrders)
+  const partOrders = useFetchTwapPartOrders(safeAddress, chainId, composableCowContract, pendingOrCancelledOrders)
+  // Here we know which orders are cancelled: if it's auth === false, then it's cancelled
+  const ordersAuthResult = useTwapOrdersAuthMulticall(safeAddress, composableCowContract, pendingOrCancelledOrders)
 
   useEffect(() => {
     if (!ordersAuthResult || !twapDiscreteOrders) return
diff --git a/src/modules/twap/utils/buildTwapOrderParamsStruct.ts b/src/modules/twap/utils/buildTwapOrderParamsStruct.ts
new file mode 100644
index 0000000000..a04c55cb96
--- /dev/null
+++ b/src/modules/twap/utils/buildTwapOrderParamsStruct.ts
@@ -0,0 +1,19 @@
+import { SupportedChainId } from '@cowprotocol/cow-sdk'
+import { defaultAbiCoder } from '@ethersproject/abi'
+import { hexZeroPad } from '@ethersproject/bytes'
+
+import { twapOrderToStruct } from './twapOrderToStruct'
+
+import { TWAP_HANDLER_ADDRESS, TWAP_ORDER_STRUCT } from '../const'
+import { ConditionalOrderParams, TWAPOrder } from '../types'
+
+// TODO: support other conditional orders (stop loss, GAT, etc.)
+export function buildTwapOrderParamsStruct(chainId: SupportedChainId, order: TWAPOrder): ConditionalOrderParams {
+  const twapOrderData = twapOrderToStruct(order)
+
+  return {
+    handler: TWAP_HANDLER_ADDRESS[chainId],
+    salt: hexZeroPad(Buffer.from(Date.now().toString(16), 'hex'), 32),
+    staticInput: defaultAbiCoder.encode([TWAP_ORDER_STRUCT], [twapOrderData]),
+  }
+}
diff --git a/src/modules/twap/utils/buildTwapOrdersItems.ts b/src/modules/twap/utils/buildTwapOrdersItems.ts
index 7445c6bed3..3b2084f771 100644
--- a/src/modules/twap/utils/buildTwapOrdersItems.ts
+++ b/src/modules/twap/utils/buildTwapOrdersItems.ts
@@ -28,13 +28,14 @@ function getTwapOrderItem(
   safeAddress: string,
   safeData: TwapOrdersSafeData,
   id: string,
-  authorized: boolean,
+  authorized: boolean | undefined,
   discreteOrder: Order | undefined
 ): TwapOrderItem {
-  const { params, submissionDate, isExecuted } = safeData
+  const { params, isExecuted, submissionDate } = safeData
 
+  const executionDate = new Date(safeData.executionDate)
   const order = parseTwapOrderStruct(params.staticInput)
-  const status = getTwapOrderStatus(order, isExecuted, authorized, discreteOrder)
+  const status = getTwapOrderStatus(order, isExecuted, executionDate, authorized, discreteOrder)
 
   return {
     order,
diff --git a/src/modules/twap/utils/getTwapOrderStatus.ts b/src/modules/twap/utils/getTwapOrderStatus.ts
index b12d3ef727..4590514e0e 100644
--- a/src/modules/twap/utils/getTwapOrderStatus.ts
+++ b/src/modules/twap/utils/getTwapOrderStatus.ts
@@ -1,18 +1,23 @@
+import ms from 'ms.macro'
+
 import { Order, PENDING_STATES } from 'legacy/state/orders/actions'
 
 import { TwapOrderStatus, TWAPOrderStruct } from '../types'
 
+const AUTH_THRESHOLD = ms`1m`
+
 export function getTwapOrderStatus(
   order: TWAPOrderStruct,
   isExecuted: boolean,
-  auth: boolean,
+  executionDate: Date,
+  auth: boolean | undefined,
   discreteOrder: Order | undefined
 ): TwapOrderStatus {
   if (isTwapOrderExpired(order)) return TwapOrderStatus.Expired
 
   if (!isExecuted) return TwapOrderStatus.WaitSigning
 
-  if (!auth) return TwapOrderStatus.Cancelled
+  if (shouldCheckAuth(executionDate) && auth === false) return TwapOrderStatus.Cancelled
 
   if (discreteOrder && PENDING_STATES.includes(discreteOrder.status)) return TwapOrderStatus.Pending
 
@@ -26,3 +31,14 @@ export function isTwapOrderExpired(order: TWAPOrderStruct): boolean {
 
   return nowTimestamp > endTime
 }
+
+/**
+ * ComposableCow.singleOrders returns false by default
+ * To avoid false-positive values, we should not check authorized flag within first minute after execution time
+ */
+function shouldCheckAuth(executionDate: Date): boolean {
+  const executionTimestamp = executionDate.getTime()
+  const nowTimestamp = Date.now()
+
+  return nowTimestamp > executionTimestamp + AUTH_THRESHOLD
+}
diff --git a/src/modules/twap/utils/twapOrderToStruct.ts b/src/modules/twap/utils/twapOrderToStruct.ts
new file mode 100644
index 0000000000..10f0b2482b
--- /dev/null
+++ b/src/modules/twap/utils/twapOrderToStruct.ts
@@ -0,0 +1,15 @@
+import { TWAPOrder, TWAPOrderStruct } from '../types'
+
+export function twapOrderToStruct(order: TWAPOrder): TWAPOrderStruct {
+  return {
+    sellToken: order.sellAmount.currency.address,
+    buyToken: order.buyAmount.currency.address,
+    receiver: order.receiver,
+    partSellAmount: order.sellAmount.divide(order.numOfParts).quotient.toString(),
+    minPartLimit: order.buyAmount.divide(order.numOfParts).quotient.toString(),
+    t0: order.startTime,
+    n: order.numOfParts,
+    t: order.timeInterval,
+    span: order.span,
+  }
+}
diff --git a/src/modules/twap/utils/updateTwapOrdersList.ts b/src/modules/twap/utils/updateTwapOrdersList.ts
new file mode 100644
index 0000000000..6277161a92
--- /dev/null
+++ b/src/modules/twap/utils/updateTwapOrdersList.ts
@@ -0,0 +1,25 @@
+import { TWAP_PENDING_STATUSES } from '../const'
+import { TwapOrdersList } from '../state/twapOrdersListAtom'
+
+/**
+ *
+ * This function merge current state of TWAP orders list with a new one
+ * It only updates an order if it in a pending state
+ */
+export function updateTwapOrdersList(currentState: TwapOrdersList, nextState: TwapOrdersList): TwapOrdersList {
+  // Filter nextState and left only orders with pending statuses
+  const newState = Object.keys(nextState).reduce<TwapOrdersList>((acc, orderId) => {
+    const currentOrder = currentState[orderId]
+
+    // Insert an order if it's not exist in the state
+    // Update an order only if it's in pending state
+    // Otherwise, don't update it
+    if (!currentOrder || TWAP_PENDING_STATUSES.includes(currentOrder.status)) {
+      acc[orderId] = nextState[orderId]
+    }
+
+    return acc
+  }, {})
+
+  return { ...currentState, ...newState }
+}
diff --git a/src/utils/orderUtils/getIsComposableCowChildOrder.ts b/src/utils/orderUtils/getIsComposableCowChildOrder.ts
new file mode 100644
index 0000000000..2b1e1387da
--- /dev/null
+++ b/src/utils/orderUtils/getIsComposableCowChildOrder.ts
@@ -0,0 +1,5 @@
+import { ComposableCowInfo } from 'common/types'
+
+export function getIsComposableCowChildOrder(order: { composableCowInfo?: ComposableCowInfo }): boolean {
+  return !!order.composableCowInfo?.parentId
+}
diff --git a/src/utils/orderUtils/getIsComposableCowParentOrder.ts b/src/utils/orderUtils/getIsComposableCowParentOrder.ts
new file mode 100644
index 0000000000..f45f07ee6b
--- /dev/null
+++ b/src/utils/orderUtils/getIsComposableCowParentOrder.ts
@@ -0,0 +1,5 @@
+import { ComposableCowInfo } from 'common/types'
+
+export function getIsComposableCowParentOrder(order: { composableCowInfo?: ComposableCowInfo }): boolean {
+  return !!order.composableCowInfo?.id
+}

From 3aa51c4437ccc8cbabc5f0554d17311a3320a74e Mon Sep 17 00:00:00 2001
From: Alexandr Kazachenko <shoom3301@gmail.com>
Date: Wed, 14 Jun 2023 16:17:09 +0600
Subject: [PATCH 19/67] ci: deploy on barn/staging automatically after creating
 a release (#2655)

---
 .github/workflows/ci.yml             | 13 -------------
 .github/workflows/release-please.yml | 11 +++++++++++
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4170bc5847..db410501bc 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -159,19 +159,6 @@ jobs:
     with:
       env_name: dev
 
-  vercel-pre-prod:
-    # Deploys to Vercel staging and barn environments
-    name: Vercel pre-prod
-    needs: [test, lint]
-    if: startsWith(github.ref, 'refs/tags/v')
-    uses: ./.github/workflows/vercel.yml
-    secrets: inherit
-    strategy:
-      matrix:
-        env_name: [barn, staging] # deploys both in parallel
-    with:
-      env_name: ${{ matrix.env_name }}
-
   vercel-prod:
     # Deploys to Vercel prod environment
     name: Vercel prod
diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
index e3e63e5e33..db021674c4 100644
--- a/.github/workflows/release-please.yml
+++ b/.github/workflows/release-please.yml
@@ -14,7 +14,18 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: google-github-actions/release-please-action@v3
+        name: release
         with:
           release-type: node
           package-name: release-please-action
           default-branch: main
+        # Deploys to Vercel staging and barn environments
+      - uses: ./.github/workflows/vercel.yml
+        name: deploy
+        if: ${{ steps.release.outputs.release_created }}
+        secrets: inherit
+        strategy:
+          matrix:
+            env_name: [ barn, staging ] # deploys both in parallel
+        with:
+          env_name: ${{ matrix.env_name }}

From f92ffff21441298c8e981e039a7708d0bb3bf510 Mon Sep 17 00:00:00 2001
From: Leandro <alfetopito@users.noreply.github.com>
Date: Wed, 14 Jun 2023 06:56:28 -0700
Subject: [PATCH 20/67] feat(twap): launch darkly feature flag (#2654)

* refactor: add subfolder hooks/featureFlags

* feat: add hook for advancedOrdersEnabled feature flag

* feat: add utils for building main menu items

* feat: add useMenuItems hook

* feat: use mainMenu from hook on header

* feat: add FeatureGuard to TradeWigetLinks with advancedOrdersEnabled flag

* refactor: remove ADVANCED_ORDERS_FEATURE_FLAG

* refactor: add useTradeRouteContext

* feat: redirect from advanced to swap when flag is off

* chore: add clone-deep to package.json (was already a peer dep)

* fix: make deep copy of MAIN_MENU to avoid mutating original

* refactor: more specific useMemo deps to avoid unnecessary re-renders

* fix: unit tests
---
 package.json                                  |  4 ++-
 src/common/containers/FeatureGuard/index.tsx  |  2 +-
 .../{ => featureFlags}/useFeatureFlags.ts     |  0
 .../useIsEthFlowBundlingEnabled.ts            |  2 +-
 .../useIsTxBundlingEnabled.ts                 |  2 +-
 .../hooks/useIsAdvancedOrdersEnabled.ts       |  7 ++++
 src/constants/featureFlags.ts                 |  2 --
 src/legacy/components/Header/index.tsx        | 23 +++++++------
 .../containers/TradeWidgetLinks/index.tsx     | 22 +++---------
 .../LimitOrdersConfirmModal/index.tsx         |  4 +--
 .../containers/LimitOrdersWidget/index.tsx    |  6 ++--
 .../containers/SettingsWidget/index.tsx       |  2 +-
 .../hooks/useHandleOrderPlacement.test.ts     |  6 ++--
 .../hooks/useIsSafeApprovalBundle.ts          |  2 +-
 .../limitOrders/hooks/useTradeFlowContext.ts  |  4 +--
 src/modules/mainMenu/constants/mainMenu.ts    | 15 ++------
 src/modules/mainMenu/hooks.ts                 | 12 +++++++
 src/modules/mainMenu/index.ts                 |  2 ++
 src/modules/mainMenu/utils.ts                 | 34 +++++++++++++++++++
 src/modules/swap/hooks/useIsSafeEthFlow.ts    |  2 +-
 .../swap/hooks/useSwapButtonContext.ts        |  4 +--
 .../trade/hooks/useTradeRouteContext.ts       | 19 +++++++++++
 .../hooks/useTradeFormValidationContext.ts    |  2 +-
 src/pages/AdvancedOrders/index.tsx            | 15 ++++++++
 src/utils/featureFlags.ts                     |  4 +--
 yarn.lock                                     |  5 +++
 26 files changed, 136 insertions(+), 66 deletions(-)
 rename src/common/hooks/{ => featureFlags}/useFeatureFlags.ts (100%)
 rename src/common/hooks/{ => featureFlags}/useIsEthFlowBundlingEnabled.ts (78%)
 rename src/common/hooks/{ => featureFlags}/useIsTxBundlingEnabled.ts (77%)
 create mode 100644 src/common/hooks/useIsAdvancedOrdersEnabled.ts
 create mode 100644 src/modules/mainMenu/hooks.ts
 create mode 100644 src/modules/mainMenu/utils.ts
 create mode 100644 src/modules/trade/hooks/useTradeRouteContext.ts

diff --git a/package.json b/package.json
index f115069b3a..48e3220821 100644
--- a/package.json
+++ b/package.json
@@ -97,7 +97,6 @@
     "@sentry/react": "^7.3.0",
     "@sentry/tracing": "^7.3.0",
     "@sentry/webpack-plugin": "^1.17.1",
-    "@types/ms": "^0.7.31",
     "@uniswap/governance": "^1.0.2",
     "@uniswap/liquidity-staker": "^1.0.2",
     "@uniswap/merkle-distributor": "1.0.1",
@@ -128,6 +127,7 @@
     "bnc-sdk": "^4.6.0",
     "buffer": "^6.0.3",
     "cids": "^1.0.0",
+    "clone-deep": "^4.0.1",
     "copy-to-clipboard": "^3.2.0",
     "cross-env": "^7.0.3",
     "d3": "^7.8.1",
@@ -208,8 +208,10 @@
     "@testing-library/react-hooks": "^8.0.1",
     "@testing-library/user-event": "^13.5.0",
     "@typechain/ethers-v5": "^10.2.0",
+    "@types/clone-deep": "^4.0.1",
     "@types/d3": "^7.4.0",
     "@types/jest": "^27.5.2",
+    "@types/ms": "^0.7.31",
     "@types/ms.macro": "^2.0.0",
     "@types/node": "^16.18.11",
     "@types/react": "^18.0.26",
diff --git a/src/common/containers/FeatureGuard/index.tsx b/src/common/containers/FeatureGuard/index.tsx
index 136477dba1..b731802dd7 100644
--- a/src/common/containers/FeatureGuard/index.tsx
+++ b/src/common/containers/FeatureGuard/index.tsx
@@ -1,6 +1,6 @@
 import { ReactNode } from 'react'
 
-import { useFeatureFlags } from 'common/hooks/useFeatureFlags'
+import { useFeatureFlags } from 'common/hooks/featureFlags/useFeatureFlags'
 
 interface FeatureGuardProps {
   featureFlag: string
diff --git a/src/common/hooks/useFeatureFlags.ts b/src/common/hooks/featureFlags/useFeatureFlags.ts
similarity index 100%
rename from src/common/hooks/useFeatureFlags.ts
rename to src/common/hooks/featureFlags/useFeatureFlags.ts
diff --git a/src/common/hooks/useIsEthFlowBundlingEnabled.ts b/src/common/hooks/featureFlags/useIsEthFlowBundlingEnabled.ts
similarity index 78%
rename from src/common/hooks/useIsEthFlowBundlingEnabled.ts
rename to src/common/hooks/featureFlags/useIsEthFlowBundlingEnabled.ts
index 82ca3e4dc8..83e356e127 100644
--- a/src/common/hooks/useIsEthFlowBundlingEnabled.ts
+++ b/src/common/hooks/featureFlags/useIsEthFlowBundlingEnabled.ts
@@ -1,6 +1,6 @@
 import { useIsBundlingSupported } from 'modules/wallet'
 
-import { useFeatureFlags } from 'common/hooks/useFeatureFlags'
+import { useFeatureFlags } from 'common/hooks/featureFlags/useFeatureFlags'
 
 export function useIsEthFlowBundlingEnabled(): boolean {
   const isBundlingSupported = useIsBundlingSupported()
diff --git a/src/common/hooks/useIsTxBundlingEnabled.ts b/src/common/hooks/featureFlags/useIsTxBundlingEnabled.ts
similarity index 77%
rename from src/common/hooks/useIsTxBundlingEnabled.ts
rename to src/common/hooks/featureFlags/useIsTxBundlingEnabled.ts
index c258ed745e..d4fc5a328d 100644
--- a/src/common/hooks/useIsTxBundlingEnabled.ts
+++ b/src/common/hooks/featureFlags/useIsTxBundlingEnabled.ts
@@ -1,6 +1,6 @@
 import { useIsBundlingSupported } from 'modules/wallet'
 
-import { useFeatureFlags } from 'common/hooks/useFeatureFlags'
+import { useFeatureFlags } from 'common/hooks/featureFlags/useFeatureFlags'
 
 export function useIsTxBundlingEnabled(): boolean {
   const isBundlingSupported = useIsBundlingSupported()
diff --git a/src/common/hooks/useIsAdvancedOrdersEnabled.ts b/src/common/hooks/useIsAdvancedOrdersEnabled.ts
new file mode 100644
index 0000000000..2fb41c4c8b
--- /dev/null
+++ b/src/common/hooks/useIsAdvancedOrdersEnabled.ts
@@ -0,0 +1,7 @@
+import { useFeatureFlags } from './featureFlags/useFeatureFlags'
+
+export function useIsAdvancedOrdersEnabled(): boolean {
+  const { advancedOrdersEnabled } = useFeatureFlags()
+
+  return advancedOrdersEnabled
+}
diff --git a/src/constants/featureFlags.ts b/src/constants/featureFlags.ts
index b4c9f01ee3..bb23b1417d 100644
--- a/src/constants/featureFlags.ts
+++ b/src/constants/featureFlags.ts
@@ -4,5 +4,3 @@ export const ordersTableFeatures = {
   DISPLAY_EST_EXECUTION_PRICE: false,
   DISPLAY_EXECUTION_TIME: false,
 }
-
-export const ADVANCED_ORDERS_FEATURE_FLAG = 'advanced-orders'
diff --git a/src/legacy/components/Header/index.tsx b/src/legacy/components/Header/index.tsx
index 1eb14be138..30981bc97e 100644
--- a/src/legacy/components/Header/index.tsx
+++ b/src/legacy/components/Header/index.tsx
@@ -1,7 +1,6 @@
-import React, { useState, useEffect, useCallback, useMemo } from 'react'
+import React, { useCallback, useEffect, useMemo, useState } from 'react'
 
-import { SupportedChainId as ChainId } from '@cowprotocol/cow-sdk'
-import { SupportedChainId } from '@cowprotocol/cow-sdk'
+import { SupportedChainId as ChainId, SupportedChainId } from '@cowprotocol/cow-sdk'
 
 import SVG from 'react-inlinesvg'
 import { useNavigate } from 'react-router-dom'
@@ -9,14 +8,14 @@ import { useNavigate } from 'react-router-dom'
 import { toggleDarkModeAnalytics } from 'legacy/components/analytics'
 import CowBalanceButton from 'legacy/components/CowBalanceButton'
 import NetworkSelector from 'legacy/components/Header/NetworkSelector'
-import { useMediaQuery, upToSmall, upToMedium, upToLarge, LargeAndUp } from 'legacy/hooks/useMediaQuery'
+import { LargeAndUp, upToLarge, upToMedium, upToSmall, useMediaQuery } from 'legacy/hooks/useMediaQuery'
 import { useDarkModeManager } from 'legacy/state/user/hooks'
 import { cowSwapLogo } from 'legacy/theme/cowSwapAssets'
 import { supportedChainId } from 'legacy/utils/supportedChainId'
 import { addBodyClass, removeBodyClass } from 'legacy/utils/toggleBodyClass'
 
 import { OrdersPanel } from 'modules/account/containers/OrdersPanel'
-import { MAIN_MENU, MainMenuContext } from 'modules/mainMenu'
+import { MainMenuContext, useMenuItems } from 'modules/mainMenu'
 import { MenuTree } from 'modules/mainMenu/pure/MenuTree'
 import { useSwapRawState } from 'modules/swap/hooks/useSwapRawState'
 import { useNativeCurrencyBalances } from 'modules/tokens/hooks/useCurrencyBalance'
@@ -29,16 +28,16 @@ import { Routes } from 'constants/routes'
 
 import MobileMenuIcon from './MobileMenuIcon'
 import {
-  Wrapper,
-  Title,
-  LogoImage,
-  HeaderModWrapper,
-  UniIcon,
   AccountElement,
   BalanceText,
   HeaderControls,
   HeaderElement,
+  HeaderModWrapper,
   HeaderRow,
+  LogoImage,
+  Title,
+  UniIcon,
+  Wrapper,
 } from './styled'
 
 // Assets
@@ -70,6 +69,8 @@ export default function Header() {
     !isOrdersPanelOpen && removeBodyClass('noScroll')
   }
 
+  const menuItems = useMenuItems()
+
   const navigate = useNavigate()
   const handleBalanceButtonClick = () => navigate('/account')
   const isUpToLarge = useMediaQuery(upToLarge)
@@ -128,7 +129,7 @@ export default function Header() {
               </LogoImage>
             </UniIcon>
           </Title>
-          <MenuTree items={MAIN_MENU} isMobileMenuOpen={isMobileMenuOpen} context={menuContext} />
+          <MenuTree items={menuItems} isMobileMenuOpen={isMobileMenuOpen} context={menuContext} />
         </HeaderRow>
 
         <HeaderControls>
diff --git a/src/modules/application/containers/TradeWidgetLinks/index.tsx b/src/modules/application/containers/TradeWidgetLinks/index.tsx
index a51d26fbf2..8e895d31d6 100644
--- a/src/modules/application/containers/TradeWidgetLinks/index.tsx
+++ b/src/modules/application/containers/TradeWidgetLinks/index.tsx
@@ -1,27 +1,15 @@
-import { useMemo } from 'react'
-
 import { Trans } from '@lingui/macro'
 
-import { useTradeState } from 'modules/trade/hooks/useTradeState'
+import { useTradeRouteContext } from 'modules/trade/hooks/useTradeRouteContext'
 import { parameterizeTradeRoute } from 'modules/trade/utils/parameterizeTradeRoute'
 
-import { ADVANCED_ORDERS_FEATURE_FLAG } from 'constants/featureFlags'
+import { FeatureGuard } from 'common/containers/FeatureGuard'
 import { Routes } from 'constants/routes'
-import { FeatureFlag } from 'utils/featureFlags'
 
 import * as styledEl from './styled'
 
 export function TradeWidgetLinks() {
-  const { state } = useTradeState()
-
-  const tradeContext = useMemo(
-    () => ({
-      inputCurrencyId: state?.inputCurrencyId || undefined,
-      outputCurrencyId: state?.outputCurrencyId || undefined,
-      chainId: state?.chainId?.toString(),
-    }),
-    [state]
-  )
+  const tradeContext = useTradeRouteContext()
 
   return (
     <styledEl.Wrapper>
@@ -43,7 +31,7 @@ export function TradeWidgetLinks() {
         </styledEl.Link>
       </styledEl.MenuItem>
 
-      {FeatureFlag.get(ADVANCED_ORDERS_FEATURE_FLAG) && (
+      <FeatureGuard featureFlag="advancedOrdersEnabled">
         <styledEl.MenuItem>
           <styledEl.Link
             className={({ isActive }) => (isActive ? 'active' : undefined)}
@@ -55,7 +43,7 @@ export function TradeWidgetLinks() {
             </styledEl.Badge>
           </styledEl.Link>
         </styledEl.MenuItem>
-      )}
+      </FeatureGuard>
     </styledEl.Wrapper>
   )
 }
diff --git a/src/modules/limitOrders/containers/LimitOrdersConfirmModal/index.tsx b/src/modules/limitOrders/containers/LimitOrdersConfirmModal/index.tsx
index aeb0462196..bb40ab4381 100644
--- a/src/modules/limitOrders/containers/LimitOrdersConfirmModal/index.tsx
+++ b/src/modules/limitOrders/containers/LimitOrdersConfirmModal/index.tsx
@@ -13,9 +13,9 @@ import { executionPriceAtom } from 'modules/limitOrders/state/executionPriceAtom
 import { limitOrdersSettingsAtom } from 'modules/limitOrders/state/limitOrdersSettingsAtom'
 import { limitRateAtom } from 'modules/limitOrders/state/limitRateAtom'
 import { partiallyFillableOverrideAtom } from 'modules/limitOrders/state/partiallyFillableOverride'
-import { TradeConfirmModal, useTradeConfirmActions, TradeConfirmation } from 'modules/trade'
+import { TradeConfirmation, TradeConfirmModal, useTradeConfirmActions } from 'modules/trade'
 
-import { useFeatureFlags } from 'common/hooks/useFeatureFlags'
+import { useFeatureFlags } from 'common/hooks/featureFlags/useFeatureFlags'
 import { useRateInfoParams } from 'common/hooks/useRateInfoParams'
 import { CurrencyPreviewInfo } from 'common/pure/CurrencyAmountPreview'
 import { TokenSymbol } from 'common/pure/TokenSymbol'
diff --git a/src/modules/limitOrders/containers/LimitOrdersWidget/index.tsx b/src/modules/limitOrders/containers/LimitOrdersWidget/index.tsx
index fb01752552..f6817a6f92 100644
--- a/src/modules/limitOrders/containers/LimitOrdersWidget/index.tsx
+++ b/src/modules/limitOrders/containers/LimitOrdersWidget/index.tsx
@@ -15,11 +15,11 @@ import { useLimitOrdersPriceImpactParams } from 'modules/limitOrders/hooks/useLi
 import { useSetupLimitOrderAmountsFromUrl } from 'modules/limitOrders/hooks/useSetupLimitOrderAmountsFromUrl'
 import { InfoBanner } from 'modules/limitOrders/pure/InfoBanner'
 import { partiallyFillableOverrideAtom } from 'modules/limitOrders/state/partiallyFillableOverride'
-import { useSetupTradeState, TradeWidget } from 'modules/trade'
+import { TradeWidget, useSetupTradeState } from 'modules/trade'
 import { useIsWrapOrUnwrap } from 'modules/trade/hooks/useIsWrapOrUnwrap'
-import { useTradeQuote, useSetTradeQuoteParams } from 'modules/tradeQuote'
+import { useSetTradeQuoteParams, useTradeQuote } from 'modules/tradeQuote'
 
-import { useFeatureFlags } from 'common/hooks/useFeatureFlags'
+import { useFeatureFlags } from 'common/hooks/featureFlags/useFeatureFlags'
 import { useRateInfoParams } from 'common/hooks/useRateInfoParams'
 import { CurrencyInfo } from 'common/pure/CurrencyInputPanel/types'
 
diff --git a/src/modules/limitOrders/containers/SettingsWidget/index.tsx b/src/modules/limitOrders/containers/SettingsWidget/index.tsx
index 86d7dd895a..7d8e3dcde3 100644
--- a/src/modules/limitOrders/containers/SettingsWidget/index.tsx
+++ b/src/modules/limitOrders/containers/SettingsWidget/index.tsx
@@ -4,7 +4,7 @@ import React, { useCallback, useState } from 'react'
 
 import { Menu, MenuItem } from '@reach/menu-button'
 
-import { useFeatureFlags } from 'common/hooks/useFeatureFlags'
+import { useFeatureFlags } from 'common/hooks/featureFlags/useFeatureFlags'
 import { ExpertModeModal } from 'common/pure/ExpertModeModal'
 
 import * as styledEl from './styled'
diff --git a/src/modules/limitOrders/hooks/useHandleOrderPlacement.test.ts b/src/modules/limitOrders/hooks/useHandleOrderPlacement.test.ts
index 2d0b1cdd5e..3ee0352b0a 100644
--- a/src/modules/limitOrders/hooks/useHandleOrderPlacement.test.ts
+++ b/src/modules/limitOrders/hooks/useHandleOrderPlacement.test.ts
@@ -9,13 +9,13 @@ import { safeBundleFlow } from 'modules/limitOrders/services/safeBundleFlow'
 import { tradeFlow } from 'modules/limitOrders/services/tradeFlow'
 import { TradeFlowContext } from 'modules/limitOrders/services/types'
 
-import { useIsTxBundlingEnabled } from 'common/hooks/useIsTxBundlingEnabled'
+import { useIsTxBundlingEnabled } from 'common/hooks/featureFlags/useIsTxBundlingEnabled'
 import { useNeedsApproval } from 'common/hooks/useNeedsApproval'
 import { withModalProvider } from 'utils/withModalProvider'
 
 import { useHandleOrderPlacement } from './useHandleOrderPlacement'
 
-import { TradeConfirmActions } from '../../trade/hooks/useTradeConfirmActions'
+import { TradeConfirmActions } from '../../trade'
 import { TradeAmounts } from '../../trade/types/TradeAmounts'
 import { limitOrdersRawStateAtom, updateLimitOrdersRawStateAtom } from '../state/limitOrdersRawStateAtom'
 import { defaultLimitOrdersSettings } from '../state/limitOrdersSettingsAtom'
@@ -25,7 +25,7 @@ jest.mock('modules/limitOrders/services/safeBundleFlow')
 
 jest.mock('modules/limitOrders/hooks/useSafeBundleFlowContext')
 jest.mock('common/hooks/useNeedsApproval')
-jest.mock('common/hooks/useIsTxBundlingEnabled')
+jest.mock('common/hooks/featureFlags/useIsTxBundlingEnabled')
 
 const mockTradeFlow = tradeFlow as jest.MockedFunction<typeof tradeFlow>
 const mockSafeBundleFlow = safeBundleFlow as jest.MockedFunction<typeof safeBundleFlow>
diff --git a/src/modules/limitOrders/hooks/useIsSafeApprovalBundle.ts b/src/modules/limitOrders/hooks/useIsSafeApprovalBundle.ts
index 0b2bcc1dc0..aad313adb9 100644
--- a/src/modules/limitOrders/hooks/useIsSafeApprovalBundle.ts
+++ b/src/modules/limitOrders/hooks/useIsSafeApprovalBundle.ts
@@ -2,7 +2,7 @@ import { Currency, CurrencyAmount } from '@uniswap/sdk-core'
 
 import { Nullish } from 'types'
 
-import { useIsTxBundlingEnabled } from 'common/hooks/useIsTxBundlingEnabled'
+import { useIsTxBundlingEnabled } from 'common/hooks/featureFlags/useIsTxBundlingEnabled'
 import { useNeedsApproval } from 'common/hooks/useNeedsApproval'
 
 export function useIsSafeApprovalBundle(amount: Nullish<CurrencyAmount<Currency>>): boolean {
diff --git a/src/modules/limitOrders/hooks/useTradeFlowContext.ts b/src/modules/limitOrders/hooks/useTradeFlowContext.ts
index 62f14d61b2..523c0dc393 100644
--- a/src/modules/limitOrders/hooks/useTradeFlowContext.ts
+++ b/src/modules/limitOrders/hooks/useTradeFlowContext.ts
@@ -10,14 +10,14 @@ import { useGP2SettlementContract } from 'legacy/hooks/useContract'
 import useENSAddress from 'legacy/hooks/useENSAddress'
 import { AppDispatch } from 'legacy/state'
 
-import { useUploadAppData, useAppData } from 'modules/appData'
+import { useAppData, useUploadAppData } from 'modules/appData'
 import { useRateImpact } from 'modules/limitOrders/hooks/useRateImpact'
 import { TradeFlowContext } from 'modules/limitOrders/services/types'
 import { limitOrdersSettingsAtom } from 'modules/limitOrders/state/limitOrdersSettingsAtom'
 import { useTradeQuote } from 'modules/tradeQuote'
 import { useGnosisSafeInfo, useWalletDetails, useWalletInfo } from 'modules/wallet'
 
-import { useFeatureFlags } from 'common/hooks/useFeatureFlags'
+import { useFeatureFlags } from 'common/hooks/featureFlags/useFeatureFlags'
 
 import { useLimitOrdersDerivedState } from './useLimitOrdersDerivedState'
 
diff --git a/src/modules/mainMenu/constants/mainMenu.ts b/src/modules/mainMenu/constants/mainMenu.ts
index 06ad41396a..96756960b6 100644
--- a/src/modules/mainMenu/constants/mainMenu.ts
+++ b/src/modules/mainMenu/constants/mainMenu.ts
@@ -11,12 +11,9 @@ import IMAGE_TERMS_AND_CONDITIONS from 'legacy/assets/cow-swap/terms-and-conditi
 import IMAGE_TWITTER from 'legacy/assets/cow-swap/twitter.svg'
 import { CONTRACTS_CODE_LINK, DISCORD_LINK, DOCS_LINK, DUNE_DASHBOARD_LINK, TWITTER_LINK } from 'legacy/constants'
 
-import { ADVANCED_ORDERS_FEATURE_FLAG } from 'constants/featureFlags'
 import { Routes } from 'constants/routes'
-import { FeatureFlag } from 'utils/featureFlags'
-import { isNotNullish } from 'utils/isNotNullish'
 
-import { BasicMenuLink, InternalLink, MainMenuItemId, MenuItemKind, MenuLink, MenuTreeItem } from '../types'
+import { BasicMenuLink, InternalLink, MainMenuItemId, MenuItemKind, MenuTreeItem } from '../types'
 
 export const isBasicMenuLink = (item: any): item is BasicMenuLink => {
   return !!(item.title && item.url)
@@ -50,15 +47,7 @@ export const MAIN_MENU: MenuTreeItem[] = [
             title: 'Limit orders',
             url: Routes.LIMIT_ORDER,
           },
-          FeatureFlag.get(ADVANCED_ORDERS_FEATURE_FLAG)
-            ? {
-                id: MainMenuItemId.ADVANCED_ORDERS,
-                kind: MenuItemKind.DYNAMIC_LINK,
-                title: 'Advanced orders',
-                url: Routes.ADVANCED_ORDERS,
-              }
-            : null,
-        ].filter(isNotNullish) as MenuLink[],
+        ],
       },
     ],
   },
diff --git a/src/modules/mainMenu/hooks.ts b/src/modules/mainMenu/hooks.ts
new file mode 100644
index 0000000000..3644d491dc
--- /dev/null
+++ b/src/modules/mainMenu/hooks.ts
@@ -0,0 +1,12 @@
+import { useMemo } from 'react'
+
+import { useIsAdvancedOrdersEnabled } from 'common/hooks/useIsAdvancedOrdersEnabled'
+
+import { MenuTreeItem } from './types'
+import { buildMainMenuTreeItems } from './utils'
+
+export function useMenuItems(): MenuTreeItem[] {
+  const isAdvancedOrdersEnabled = useIsAdvancedOrdersEnabled()
+
+  return useMemo(() => buildMainMenuTreeItems({ isAdvancedOrdersEnabled }), [isAdvancedOrdersEnabled])
+}
diff --git a/src/modules/mainMenu/index.ts b/src/modules/mainMenu/index.ts
index 28508e16a2..52c64f81db 100644
--- a/src/modules/mainMenu/index.ts
+++ b/src/modules/mainMenu/index.ts
@@ -1,2 +1,4 @@
 export * from './constants/mainMenu'
 export * from './types'
+export * from './utils'
+export * from './hooks'
diff --git a/src/modules/mainMenu/utils.ts b/src/modules/mainMenu/utils.ts
new file mode 100644
index 0000000000..7835aa5120
--- /dev/null
+++ b/src/modules/mainMenu/utils.ts
@@ -0,0 +1,34 @@
+import cloneDeep from 'clone-deep'
+
+import { MAIN_MENU } from './constants/mainMenu'
+import { DropDownItem, MainMenuItemId, MenuItemKind, MenuTreeItem } from './types'
+
+import { Routes } from '../../constants/routes'
+
+const ADVANCED_ORDERS_MENU_TITLE = 'Advanced orders'
+
+export type BuildMainMenuTreeItemsParams = {
+  isAdvancedOrdersEnabled: boolean
+}
+
+export function buildMainMenuTreeItems({ isAdvancedOrdersEnabled }: BuildMainMenuTreeItemsParams): MenuTreeItem[] {
+  if (!isAdvancedOrdersEnabled) {
+    return MAIN_MENU
+  }
+
+  // Make a deep copy to avoid mutating original
+  const mainMenuCopy = cloneDeep(MAIN_MENU)
+
+  // Assume trade menu is at the first position
+  const [tradeMenu] = mainMenuCopy
+
+  // Add to the bottom of the list
+  ;(tradeMenu as DropDownItem).items[0].links.push({
+    id: MainMenuItemId.ADVANCED_ORDERS,
+    kind: MenuItemKind.DYNAMIC_LINK,
+    title: ADVANCED_ORDERS_MENU_TITLE,
+    url: Routes.ADVANCED_ORDERS,
+  })
+
+  return mainMenuCopy
+}
diff --git a/src/modules/swap/hooks/useIsSafeEthFlow.ts b/src/modules/swap/hooks/useIsSafeEthFlow.ts
index b963c32a7b..a108950381 100644
--- a/src/modules/swap/hooks/useIsSafeEthFlow.ts
+++ b/src/modules/swap/hooks/useIsSafeEthFlow.ts
@@ -1,4 +1,4 @@
-import { useIsEthFlowBundlingEnabled } from 'common/hooks/useIsEthFlowBundlingEnabled'
+import { useIsEthFlowBundlingEnabled } from 'common/hooks/featureFlags/useIsEthFlowBundlingEnabled'
 
 import { useIsSwapEth } from './useIsSwapEth'
 
diff --git a/src/modules/swap/hooks/useSwapButtonContext.ts b/src/modules/swap/hooks/useSwapButtonContext.ts
index 7f4ccbf2ac..8a13005ddd 100644
--- a/src/modules/swap/hooks/useSwapButtonContext.ts
+++ b/src/modules/swap/hooks/useSwapButtonContext.ts
@@ -26,9 +26,9 @@ import { useWrappedToken } from 'modules/trade/hooks/useWrappedToken'
 import { useGnosisSafeInfo, useWalletDetails, useWalletInfo } from 'modules/wallet'
 
 import { useTradeApproveState } from 'common/containers/TradeApprove/useTradeApproveState'
-import { useIsEthFlowBundlingEnabled } from 'common/hooks/useIsEthFlowBundlingEnabled'
+import { useIsEthFlowBundlingEnabled } from 'common/hooks/featureFlags/useIsEthFlowBundlingEnabled'
+import { useIsTxBundlingEnabled } from 'common/hooks/featureFlags/useIsTxBundlingEnabled'
 import { useIsSmartContractWallet } from 'common/hooks/useIsSmartContractWallet'
-import { useIsTxBundlingEnabled } from 'common/hooks/useIsTxBundlingEnabled'
 import { formatSymbol } from 'utils/format'
 
 import { useSafeBundleEthFlowContext } from './useSafeBundleEthFlowContext'
diff --git a/src/modules/trade/hooks/useTradeRouteContext.ts b/src/modules/trade/hooks/useTradeRouteContext.ts
new file mode 100644
index 0000000000..8ca0975037
--- /dev/null
+++ b/src/modules/trade/hooks/useTradeRouteContext.ts
@@ -0,0 +1,19 @@
+import { useMemo } from 'react'
+
+import { useTradeState } from './useTradeState'
+
+import { TradeUrlParams } from '../types/TradeRawState'
+
+export function useTradeRouteContext(): TradeUrlParams {
+  const { state } = useTradeState()
+  const { inputCurrencyId, outputCurrencyId, chainId } = state || {}
+
+  return useMemo(
+    () => ({
+      inputCurrencyId: inputCurrencyId || undefined,
+      outputCurrencyId: outputCurrencyId || undefined,
+      chainId: chainId?.toString(),
+    }),
+    [inputCurrencyId, outputCurrencyId, chainId]
+  )
+}
diff --git a/src/modules/tradeFormValidation/hooks/useTradeFormValidationContext.ts b/src/modules/tradeFormValidation/hooks/useTradeFormValidationContext.ts
index f4ad4ad11f..0074bcfdf4 100644
--- a/src/modules/tradeFormValidation/hooks/useTradeFormValidationContext.ts
+++ b/src/modules/tradeFormValidation/hooks/useTradeFormValidationContext.ts
@@ -10,7 +10,7 @@ import { useTradeQuote } from 'modules/tradeQuote'
 import { useGnosisSafeInfo, useWalletDetails, useWalletInfo } from 'modules/wallet'
 
 import { useTradeApproveState } from 'common/containers/TradeApprove'
-import { useIsTxBundlingEnabled } from 'common/hooks/useIsTxBundlingEnabled'
+import { useIsTxBundlingEnabled } from 'common/hooks/featureFlags/useIsTxBundlingEnabled'
 
 import { TradeFormValidationCommonContext } from '../types'
 
diff --git a/src/pages/AdvancedOrders/index.tsx b/src/pages/AdvancedOrders/index.tsx
index 0a777311fc..a44807628b 100644
--- a/src/pages/AdvancedOrders/index.tsx
+++ b/src/pages/AdvancedOrders/index.tsx
@@ -1,10 +1,25 @@
+import { Navigate } from 'react-router-dom'
+
 import { AdvancedOrdersWidget } from 'modules/advancedOrders'
 import { OrdersTableWidget } from 'modules/ordersTable'
+import { useTradeRouteContext } from 'modules/trade/hooks/useTradeRouteContext'
 import * as styledEl from 'modules/trade/pure/TradePageLayout'
+import { parameterizeTradeRoute } from 'modules/trade/utils/parameterizeTradeRoute'
 import { TradeFormValidationUpdater } from 'modules/tradeFormValidation'
 import { TwapFormWidget } from 'modules/twap'
 
+import { useIsAdvancedOrdersEnabled } from 'common/hooks/useIsAdvancedOrdersEnabled'
+import { Routes as RoutesEnum } from 'constants/routes'
+
 export default function AdvancedOrdersPage() {
+  const isAdvancedOrdersEnabled = useIsAdvancedOrdersEnabled()
+  const tradeContext = useTradeRouteContext()
+
+  if (!isAdvancedOrdersEnabled) {
+    // To prevent direct access when the flag is off
+    return <Navigate to={parameterizeTradeRoute(tradeContext, RoutesEnum.SWAP)} />
+  }
+
   return (
     <>
       {/*TODO: add isExpertMode value*/}
diff --git a/src/utils/featureFlags.ts b/src/utils/featureFlags.ts
index 7527a4705f..11d570c7a9 100644
--- a/src/utils/featureFlags.ts
+++ b/src/utils/featureFlags.ts
@@ -1,10 +1,8 @@
 import { isProdLike } from 'legacy/utils/environments'
 
-import { ADVANCED_ORDERS_FEATURE_FLAG } from 'constants/featureFlags'
-
 // We can define here some flags to be enabled while we develop
 // TODO: update this before the deployment
-const ENABLED_FOR_DEVELOP = [ADVANCED_ORDERS_FEATURE_FLAG]
+const ENABLED_FOR_DEVELOP: string[] = []
 
 export class FeatureFlag {
   static get(name: string) {
diff --git a/yarn.lock b/yarn.lock
index 7e2d691884..14d5ea1e9e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3852,6 +3852,11 @@
     "@types/node" "*"
     "@types/responselike" "^1.0.0"
 
+"@types/clone-deep@^4.0.1":
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/@types/clone-deep/-/clone-deep-4.0.1.tgz#7c488443ab9f571cd343d774551b78e9264ea990"
+  integrity sha512-bdkCSkyVHsgl3Goe1y16T9k6JuQx7SiDREkq728QjKmTZkGJZuS8R3gGcnGzVuGBP0mssKrzM/GlMOQxtip9cg==
+
 "@types/connect-history-api-fallback@^1.3.5":
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz#d1f7a8a09d0ed5a57aee5ae9c18ab9b803205dae"

From bd7e840425da8872662d9f1b650cc5b608e3d9ec Mon Sep 17 00:00:00 2001
From: Alexandr Kazachenko <shoom3301@gmail.com>
Date: Thu, 15 Jun 2023 13:45:40 +0600
Subject: [PATCH 21/67] feat(twap): display twap-specific information on order
 receipt modal (#2652)

---
 src/common/pure/SafeWalletLink/index.tsx      | 24 ++++++
 src/common/types.ts                           | 10 +++
 .../EnhancedTransactionLink/index.tsx         |  5 +-
 .../Transaction/ActivityDetails.tsx           |  4 +-
 .../containers/Transaction/StatusDetails.tsx  | 26 +-----
 .../containers/OrdersReceiptModal/index.tsx   |  7 ++
 .../pure/ReceiptModal/FieldLabel.tsx          |  4 +-
 .../pure/ReceiptModal/fields/SafeTxFields.tsx | 54 ++++++++++++
 .../ordersTable/pure/ReceiptModal/index.tsx   | 86 ++++++++++++++-----
 .../ordersTable/pure/ReceiptModal/styled.ts   |  5 ++
 .../twap/hooks/useFetchTwapOrdersFromSafe.ts  |  3 +-
 .../twap/hooks/useFetchTwapPartOrders.ts      |  2 +-
 .../twap/hooks/useTwapOrderByChildId.ts       | 17 ++++
 src/modules/twap/hooks/useTwapOrderById.ts    | 13 +++
 src/modules/twap/index.ts                     |  2 +
 .../twap/services/fetchTwapOrdersFromSafe.ts  | 32 +++----
 src/modules/twap/state/twapOrdersListAtom.ts  |  2 +-
 src/modules/twap/types.ts                     | 10 ++-
 .../twap/updaters/TwapOrdersUpdater.tsx       |  6 +-
 .../twap/utils/buildTwapOrdersItems.ts        | 11 +--
 src/modules/wallet/api/assets/safe-logo.svg   | 10 +++
 21 files changed, 252 insertions(+), 81 deletions(-)
 create mode 100644 src/common/pure/SafeWalletLink/index.tsx
 create mode 100644 src/modules/ordersTable/pure/ReceiptModal/fields/SafeTxFields.tsx
 create mode 100644 src/modules/twap/hooks/useTwapOrderByChildId.ts
 create mode 100644 src/modules/twap/hooks/useTwapOrderById.ts
 create mode 100644 src/modules/wallet/api/assets/safe-logo.svg

diff --git a/src/common/pure/SafeWalletLink/index.tsx b/src/common/pure/SafeWalletLink/index.tsx
new file mode 100644
index 0000000000..65f7c80e1b
--- /dev/null
+++ b/src/common/pure/SafeWalletLink/index.tsx
@@ -0,0 +1,24 @@
+import { ExternalLink } from 'legacy/theme'
+
+import { getSafeWebUrl } from 'api/gnosisSafe'
+
+export function SafeWalletLink(props: {
+  chainId: number
+  safeTransaction?: { safe: string; safeTxHash: string }
+}): JSX.Element | null {
+  const { chainId, safeTransaction } = props
+
+  if (!safeTransaction) {
+    return null
+  }
+
+  const { safe, safeTxHash } = safeTransaction
+  const safeUrl = getSafeWebUrl(chainId, safe, safeTxHash)
+
+  // Only show the link to the safe, if we have the "safeUrl"
+  if (safeUrl === null) {
+    return null
+  }
+
+  return <ExternalLink href={safeUrl}>View Safe ↗</ExternalLink>
+}
diff --git a/src/common/types.ts b/src/common/types.ts
index 435fe19ee3..79b41ccd55 100644
--- a/src/common/types.ts
+++ b/src/common/types.ts
@@ -16,3 +16,13 @@ export type OrderWithComposableCowInfo = {
   order: EnrichedOrder
   composableCowInfo?: ComposableCowInfo
 }
+
+export type SafeTransactionParams = {
+  submissionDate: string
+  executionDate: string
+  isExecuted: boolean
+  nonce: number
+  confirmationsRequired: number
+  confirmations: number
+  safeTxHash: string
+}
diff --git a/src/legacy/components/EnhancedTransactionLink/index.tsx b/src/legacy/components/EnhancedTransactionLink/index.tsx
index b868c8a01a..0efd6413f4 100644
--- a/src/legacy/components/EnhancedTransactionLink/index.tsx
+++ b/src/legacy/components/EnhancedTransactionLink/index.tsx
@@ -1,9 +1,10 @@
 import { ExplorerLink } from 'legacy/components/ExplorerLink'
 import { EnhancedTransactionDetails, HashType } from 'legacy/state/enhancedTransactions/reducer'
 
-import { GnosisSafeLink } from 'modules/account/containers/Transaction/StatusDetails'
 import { useGnosisSafeInfo, useWalletInfo } from 'modules/wallet'
 
+import { SafeWalletLink } from 'common/pure/SafeWalletLink'
+
 interface Props {
   tx: EnhancedTransactionDetails
 }
@@ -24,7 +25,7 @@ export function EnhancedTransactionLink(props: Props) {
       return null
     }
 
-    return <GnosisSafeLink chainId={chainId} safeTransaction={safeTx} />
+    return <SafeWalletLink chainId={chainId} safeTransaction={safeTx} />
   } else {
     return <ExplorerLink id={tx.hash} type="transaction" />
   }
diff --git a/src/modules/account/containers/Transaction/ActivityDetails.tsx b/src/modules/account/containers/Transaction/ActivityDetails.tsx
index 076952d417..e524a59db3 100644
--- a/src/modules/account/containers/Transaction/ActivityDetails.tsx
+++ b/src/modules/account/containers/Transaction/ActivityDetails.tsx
@@ -16,11 +16,11 @@ import { useCancelOrder } from 'common/hooks/useCancelOrder'
 import { useGetSurplusData } from 'common/hooks/useGetSurplusFiatValue'
 import { CurrencyLogo } from 'common/pure/CurrencyLogo'
 import { RateInfoParams, RateInfo } from 'common/pure/RateInfo'
+import { SafeWalletLink } from 'common/pure/SafeWalletLink'
 import { TokenAmount } from 'common/pure/TokenAmount'
 
 import { ActivityDerivedState } from './index'
 
-import { GnosisSafeLink } from './StatusDetails'
 import { StatusDetails } from './StatusDetails'
 import {
   Summary,
@@ -135,7 +135,7 @@ function GnosisSafeTxDetails(props: {
       {signaturesMessage}
 
       {/* View in: Gnosis Safe */}
-      <GnosisSafeLink chainId={chainId} safeTransaction={safeTransaction} />
+      <SafeWalletLink chainId={chainId} safeTransaction={safeTransaction} />
     </TransactionInnerDetail>
   )
 }
diff --git a/src/modules/account/containers/Transaction/StatusDetails.tsx b/src/modules/account/containers/Transaction/StatusDetails.tsx
index 9bce001801..4cf611e58e 100644
--- a/src/modules/account/containers/Transaction/StatusDetails.tsx
+++ b/src/modules/account/containers/Transaction/StatusDetails.tsx
@@ -1,5 +1,3 @@
-import { SafeMultisigTransactionResponse } from '@safe-global/safe-core-sdk-types'
-
 import { ExternalLink as LinkIconFeather } from 'react-feather'
 import SVG from 'react-inlinesvg'
 
@@ -9,38 +7,16 @@ import OrderExpiredImage from 'legacy/assets/cow-swap/order-expired.svg'
 import OrderOpenImage from 'legacy/assets/cow-swap/order-open.svg'
 import PresignaturePendingImage from 'legacy/assets/cow-swap/order-presignature-pending.svg'
 import { getActivityState } from 'legacy/hooks/useActivityDerivedState'
-import { ExternalLink } from 'legacy/theme'
 import { ExplorerDataType, getExplorerLink } from 'legacy/utils/getExplorerLink'
 
 import { getSafeWebUrl } from 'api/gnosisSafe'
 import { CancelButton } from 'common/pure/CancelButton'
 import { isOrderCancellable } from 'common/utils/isOrderCancellable'
 
-import { StatusLabel, StatusLabelWrapper, StatusLabelBelow, CancelTxLink } from './styled'
+import { CancelTxLink, StatusLabel, StatusLabelBelow, StatusLabelWrapper } from './styled'
 
 import { ActivityDerivedState, determinePillColour } from './index'
 
-export function GnosisSafeLink(props: {
-  chainId: number
-  safeTransaction?: SafeMultisigTransactionResponse
-}): JSX.Element | null {
-  const { chainId, safeTransaction } = props
-
-  if (!safeTransaction) {
-    return null
-  }
-
-  const { safe, safeTxHash } = safeTransaction
-  const safeUrl = getSafeWebUrl(chainId, safe, safeTxHash)
-
-  // Only show the link to the safe, if we have the "safeUrl"
-  if (safeUrl === null) {
-    return null
-  }
-
-  return <ExternalLink href={safeUrl}>View Safe ↗</ExternalLink>
-}
-
 function _getStateLabel(activityDerivedState: ActivityDerivedState) {
   const activityState = getActivityState(activityDerivedState)
 
diff --git a/src/modules/ordersTable/containers/OrdersReceiptModal/index.tsx b/src/modules/ordersTable/containers/OrdersReceiptModal/index.tsx
index e82d3125b9..8f3cf5ccd7 100644
--- a/src/modules/ordersTable/containers/OrdersReceiptModal/index.tsx
+++ b/src/modules/ordersTable/containers/OrdersReceiptModal/index.tsx
@@ -6,6 +6,7 @@ import { supportedChainId } from 'legacy/utils/supportedChainId'
 
 import { PendingOrdersPrices } from 'modules/orders/state/pendingOrdersPricesAtom'
 import { ReceiptModal } from 'modules/ordersTable/pure/ReceiptModal'
+import { useTwapOrderById, useTwapOrderByChildId } from 'modules/twap'
 import { useWalletInfo } from 'modules/wallet'
 
 import { calculatePrice } from 'utils/orderUtils/calculatePrice'
@@ -22,6 +23,10 @@ export function OrdersReceiptModal(props: OrdersReceiptModalProps) {
   const { chainId: _chainId } = useWalletInfo()
   const closeReceiptModal = useCloseReceiptModal()
   const chainId = supportedChainId(_chainId)
+  const twapOrderById = useTwapOrderById(order?.id)
+  const twapOrderByChildId = useTwapOrderByChildId(order?.id)
+  const twapOrder = twapOrderById || twapOrderByChildId
+  const isTwapPartOrder = !!twapOrderByChildId
 
   if (!chainId || !order) {
     return null
@@ -63,6 +68,8 @@ export function OrdersReceiptModal(props: OrdersReceiptModalProps) {
       estimatedExecutionPrice={estimatedExecutionPrice}
       chainId={chainId}
       order={order}
+      twapOrder={twapOrder}
+      isTwapPartOrder={isTwapPartOrder}
       isOpen={!!order}
       onDismiss={closeReceiptModal}
     />
diff --git a/src/modules/ordersTable/pure/ReceiptModal/FieldLabel.tsx b/src/modules/ordersTable/pure/ReceiptModal/FieldLabel.tsx
index f04233ba00..216ec9cef5 100644
--- a/src/modules/ordersTable/pure/ReceiptModal/FieldLabel.tsx
+++ b/src/modules/ordersTable/pure/ReceiptModal/FieldLabel.tsx
@@ -5,11 +5,13 @@ import * as styledEl from './styled'
 interface Props {
   label: string
   tooltip?: string | JSX.Element
+  prefix?: string | JSX.Element
 }
 
-export function FieldLabel({ label, tooltip }: Props) {
+export function FieldLabel({ label, tooltip, prefix }: Props) {
   return (
     <styledEl.Label>
+      {prefix}
       <styledEl.LabelText>{label}</styledEl.LabelText>
       {tooltip && <InfoIcon content={tooltip} />}
     </styledEl.Label>
diff --git a/src/modules/ordersTable/pure/ReceiptModal/fields/SafeTxFields.tsx b/src/modules/ordersTable/pure/ReceiptModal/fields/SafeTxFields.tsx
new file mode 100644
index 0000000000..421b8fca42
--- /dev/null
+++ b/src/modules/ordersTable/pure/ReceiptModal/fields/SafeTxFields.tsx
@@ -0,0 +1,54 @@
+import { SupportedChainId } from '@cowprotocol/cow-sdk'
+
+import styled from 'styled-components/macro'
+
+import safeLogo from 'modules/wallet/api/assets/safe-logo.svg'
+
+import { SafeWalletLink } from 'common/pure/SafeWalletLink'
+
+import { FieldLabel } from '../FieldLabel'
+import { Field } from '../styled'
+
+const SafeIcon = styled.img`
+  margin-right: 5px;
+`
+
+export interface SafeTxFieldsProps {
+  chainId: SupportedChainId
+  safeAddress: string
+  safeTxHash: string
+  nonce: number
+  confirmations: number
+  confirmationsRequired: number
+}
+
+export function SafeTxFields(props: SafeTxFieldsProps) {
+  const { chainId, safeAddress, safeTxHash, nonce, confirmationsRequired, confirmations } = props
+  const safeTransaction = { safe: safeAddress, safeTxHash }
+
+  const safeLogoImg = <SafeIcon src={safeLogo} alt="Safe logo" />
+
+  return (
+    <>
+      <Field>
+        <FieldLabel label="Safe transaction" tooltip="TODO: set tooltip" prefix={safeLogoImg} />
+        <div>
+          <span>{safeTxHash.slice(0, 8)}</span> {' - '}
+          <SafeWalletLink chainId={chainId} safeTransaction={safeTransaction} />
+        </div>
+      </Field>
+
+      <Field>
+        <FieldLabel label="Safe nonce" tooltip="TODO: set tooltip" prefix={safeLogoImg} />
+        <span>{nonce}</span>
+      </Field>
+
+      <Field>
+        <FieldLabel label="Safe confirmed signatures" tooltip="TODO: set tooltip" prefix={safeLogoImg} />
+        <span>
+          {confirmations} / {confirmationsRequired}
+        </span>
+      </Field>
+    </>
+  )
+}
diff --git a/src/modules/ordersTable/pure/ReceiptModal/index.tsx b/src/modules/ordersTable/pure/ReceiptModal/index.tsx
index 928ba9def9..20d1c2939a 100644
--- a/src/modules/ordersTable/pure/ReceiptModal/index.tsx
+++ b/src/modules/ordersTable/pure/ReceiptModal/index.tsx
@@ -4,6 +4,9 @@ import { CurrencyAmount, Fraction, Token } from '@uniswap/sdk-core'
 import { OrderStatus } from 'legacy/state/orders/actions'
 import { CloseIcon } from 'legacy/theme'
 
+import { TwapOrderItem } from 'modules/twap/types'
+
+import { InlineBanner } from 'common/pure/InlineBanner'
 import { GpModal } from 'common/pure/Modal'
 import { getSellAmountWithFee } from 'utils/orderUtils/getSellAmountWithFee'
 import { ParsedOrder } from 'utils/orderUtils/parseOrder'
@@ -12,6 +15,7 @@ import { CurrencyField } from './CurrencyField'
 import { DateField } from './DateField'
 import { FeeField } from './FeeField'
 import { FieldLabel } from './FieldLabel'
+import { SafeTxFields } from './fields/SafeTxFields'
 import { FilledField } from './FilledField'
 import { IdField } from './IdField'
 import { OrderTypeField } from './OrderTypeField'
@@ -23,6 +27,8 @@ import { SurplusField } from './SurplusField'
 interface ReceiptProps {
   isOpen: boolean
   order: ParsedOrder
+  twapOrder: TwapOrderItem | null
+  isTwapPartOrder: boolean
   chainId: SupportedChainId
   onDismiss: () => void
   sellAmount: CurrencyAmount<Token>
@@ -61,6 +67,8 @@ export function ReceiptModal({
   isOpen,
   onDismiss,
   order,
+  twapOrder,
+  isTwapPartOrder,
   chainId,
   buyAmount,
   limitPrice,
@@ -73,6 +81,7 @@ export function ReceiptModal({
 
   const inputLabel = order.kind === OrderKind.SELL ? 'You sell' : 'You sell at most'
   const outputLabel = order.kind === OrderKind.SELL ? 'You receive at least' : 'You receive exactly'
+  const safeTxParams = twapOrder?.safeTxParams
 
   return (
     <GpModal onDismiss={onDismiss} isOpen={isOpen}>
@@ -82,6 +91,19 @@ export function ReceiptModal({
           <CloseIcon onClick={() => onDismiss()} />
         </styledEl.Header>
 
+        {twapOrder && (
+          <styledEl.InfoBannerWrapper>
+            <InlineBanner
+              type="information"
+              content={
+                isTwapPartOrder
+                  ? `Part of a ${twapOrder.order.n}-part TWAP order split`
+                  : `TWAP order split into ${twapOrder.order.n} parts`
+              }
+            />
+          </styledEl.InfoBannerWrapper>
+        )}
+
         <styledEl.Body>
           <CurrencyField amount={getSellAmountWithFee(order)} token={order.inputToken} label={inputLabel} />
           <CurrencyField amount={buyAmount} token={order.outputToken} label={outputLabel} />
@@ -114,20 +136,26 @@ export function ReceiptModal({
               )}
             </styledEl.Field>
 
-            <styledEl.Field>
-              <FieldLabel label="Filled" tooltip={tooltips.FILLED} />
-              <FilledField order={order} />
-            </styledEl.Field>
-
-            <styledEl.Field>
-              <FieldLabel label="Order surplus" tooltip={tooltips.SURPLUS} />
-              <SurplusField order={order} />
-            </styledEl.Field>
-
-            <styledEl.Field>
-              <FieldLabel label="Fee" tooltip={tooltips.FEE} />
-              <FeeField order={order} />
-            </styledEl.Field>
+            {/*TODO: Currently, we don't have this information for parent TWAP orders*/}
+            {/*The condition should be removed once we have the data*/}
+            {(!twapOrder || isTwapPartOrder) && (
+              <>
+                <styledEl.Field>
+                  <FieldLabel label="Filled" tooltip={tooltips.FILLED} />
+                  <FilledField order={order} />
+                </styledEl.Field>
+
+                <styledEl.Field>
+                  <FieldLabel label="Order surplus" tooltip={tooltips.SURPLUS} />
+                  <SurplusField order={order} />
+                </styledEl.Field>
+
+                <styledEl.Field>
+                  <FieldLabel label="Fee" tooltip={tooltips.FEE} />
+                  <FeeField order={order} />
+                </styledEl.Field>
+              </>
+            )}
 
             <styledEl.Field>
               <FieldLabel label="Created" tooltip={tooltips.CREATED} />
@@ -144,14 +172,28 @@ export function ReceiptModal({
               <OrderTypeField order={order} />
             </styledEl.Field>
 
-            <styledEl.Field>
-              {order.executionData.activityId && (
-                <>
-                  <FieldLabel label={order.executionData.activityTitle} />
-                  <IdField id={order.executionData.activityId} chainId={chainId} />
-                </>
-              )}
-            </styledEl.Field>
+            {/*TODO: add a link to explorer when it will support TWAP orders*/}
+            {!twapOrder && (
+              <styledEl.Field>
+                {order.executionData.activityId && (
+                  <>
+                    <FieldLabel label={order.executionData.activityTitle} />
+                    <IdField id={order.executionData.activityId} chainId={chainId} />
+                  </>
+                )}
+              </styledEl.Field>
+            )}
+            {/*TODO: make it more generic. The ReceiptModal should know about TWAP and should display Safe info for any ComposableCow order*/}
+            {twapOrder && safeTxParams && (
+              <SafeTxFields
+                chainId={chainId}
+                safeAddress={twapOrder.safeAddress}
+                safeTxHash={safeTxParams.safeTxHash}
+                nonce={safeTxParams.nonce}
+                confirmations={safeTxParams.confirmations}
+                confirmationsRequired={safeTxParams.confirmationsRequired}
+              />
+            )}
           </styledEl.FieldsWrapper>
         </styledEl.Body>
       </styledEl.Wrapper>
diff --git a/src/modules/ordersTable/pure/ReceiptModal/styled.ts b/src/modules/ordersTable/pure/ReceiptModal/styled.ts
index a968c45f2d..dce6acf859 100644
--- a/src/modules/ordersTable/pure/ReceiptModal/styled.ts
+++ b/src/modules/ordersTable/pure/ReceiptModal/styled.ts
@@ -59,6 +59,10 @@ export const FieldsWrapper = styled.div`
   `}
 `
 
+export const InfoBannerWrapper = styled.div`
+  margin: 12px;
+`
+
 export const Field = styled.div`
   display: flex;
   flex-flow: row wrap;
@@ -122,6 +126,7 @@ export const LabelText = styled.span`
 export const Label = styled.div`
   display: flex;
   gap: 4px;
+  align-items: center;
 
   // TODO: Override required to remove inline styles from StyledInfoIcon parent.
   // Need to refactor and remove the inline styles.
diff --git a/src/modules/twap/hooks/useFetchTwapOrdersFromSafe.ts b/src/modules/twap/hooks/useFetchTwapOrdersFromSafe.ts
index b2f18b34aa..583870133d 100644
--- a/src/modules/twap/hooks/useFetchTwapOrdersFromSafe.ts
+++ b/src/modules/twap/hooks/useFetchTwapOrdersFromSafe.ts
@@ -5,7 +5,8 @@ import ms from 'ms.macro'
 import { ComposableCoW } from 'abis/types'
 import { useSafeApiKit } from 'api/gnosisSafe/hooks/useSafeApiKit'
 
-import { fetchTwapOrdersFromSafe, TwapOrdersSafeData } from '../services/fetchTwapOrdersFromSafe'
+import { fetchTwapOrdersFromSafe } from '../services/fetchTwapOrdersFromSafe'
+import { TwapOrdersSafeData } from '../types'
 
 const PENDING_TWAP_UPDATE_INTERVAL = ms`10s`
 
diff --git a/src/modules/twap/hooks/useFetchTwapPartOrders.ts b/src/modules/twap/hooks/useFetchTwapPartOrders.ts
index 7e3e963b76..715d1dd383 100644
--- a/src/modules/twap/hooks/useFetchTwapPartOrders.ts
+++ b/src/modules/twap/hooks/useFetchTwapPartOrders.ts
@@ -20,7 +20,7 @@ export function useFetchTwapPartOrders(
   ordersInfo: TwapOrderInfo[]
 ): TwapPartOrders | null {
   const ordersToVerifyParams = useMemo(() => {
-    return ordersInfo.map((info) => info.safeData.params)
+    return ordersInfo.map((info) => info.safeData.conditionalOrderParams)
   }, [ordersInfo])
 
   const ordersTradeableData = useTwapOrdersTradeableMulticall(safeAddress, composableCowContract, ordersToVerifyParams)
diff --git a/src/modules/twap/hooks/useTwapOrderByChildId.ts b/src/modules/twap/hooks/useTwapOrderByChildId.ts
new file mode 100644
index 0000000000..7a26d34d91
--- /dev/null
+++ b/src/modules/twap/hooks/useTwapOrderByChildId.ts
@@ -0,0 +1,17 @@
+import { useAtomValue } from 'jotai/utils'
+import { useMemo } from 'react'
+
+import { useTwapOrderById } from './useTwapOrderById'
+
+import { twapPartOrdersListAtom } from '../state/twapPartOrdersAtom'
+import { TwapOrderItem } from '../types'
+
+export function useTwapOrderByChildId(orderId: string | undefined): TwapOrderItem | null {
+  const twapPartOrdersList = useAtomValue(twapPartOrdersListAtom)
+
+  const parentId = useMemo(() => {
+    return twapPartOrdersList.find(({ uid }) => uid === orderId)?.twapOrderId
+  }, [orderId, twapPartOrdersList])
+
+  return useTwapOrderById(parentId)
+}
diff --git a/src/modules/twap/hooks/useTwapOrderById.ts b/src/modules/twap/hooks/useTwapOrderById.ts
new file mode 100644
index 0000000000..8699832c98
--- /dev/null
+++ b/src/modules/twap/hooks/useTwapOrderById.ts
@@ -0,0 +1,13 @@
+import { useAtomValue } from 'jotai/utils'
+import { useMemo } from 'react'
+
+import { twapOrdersListAtom } from '../state/twapOrdersListAtom'
+import { TwapOrderItem } from '../types'
+
+export function useTwapOrderById(orderId: string | undefined): TwapOrderItem | null {
+  const twapOrdersList = useAtomValue(twapOrdersListAtom)
+
+  return useMemo(() => {
+    return (orderId && twapOrdersList[orderId]) || null
+  }, [orderId, twapOrdersList])
+}
diff --git a/src/modules/twap/index.ts b/src/modules/twap/index.ts
index 04222f36d9..b9406afb0f 100644
--- a/src/modules/twap/index.ts
+++ b/src/modules/twap/index.ts
@@ -1 +1,3 @@
 export * from './containers/TwapFormWidget'
+export * from './hooks/useTwapOrderById'
+export * from './hooks/useTwapOrderByChildId'
diff --git a/src/modules/twap/services/fetchTwapOrdersFromSafe.ts b/src/modules/twap/services/fetchTwapOrdersFromSafe.ts
index 40dc8017db..59b43a419e 100644
--- a/src/modules/twap/services/fetchTwapOrdersFromSafe.ts
+++ b/src/modules/twap/services/fetchTwapOrdersFromSafe.ts
@@ -5,14 +5,7 @@ import { isTruthy } from 'legacy/utils/misc'
 
 import { ComposableCoW } from 'abis/types'
 
-import { ConditionalOrderParams } from '../types'
-
-export interface TwapOrdersSafeData {
-  params: ConditionalOrderParams
-  submissionDate: string
-  executionDate: string
-  isExecuted: boolean
-}
+import { ConditionalOrderParams, TwapOrdersSafeData } from '../types'
 
 // ComposableCoW.create method
 const CREATE_COMPOSABLE_ORDER_SELECTOR = '6bfae1ca'
@@ -26,7 +19,7 @@ export async function fetchTwapOrdersFromSafe(
   const results = allTxs?.results || []
 
   return results
-    .map((result) => {
+    .map<TwapOrdersSafeData | null>((result) => {
       if (!result.data || !isSafeMultisigTransactionListResponse(result)) return null
 
       const selectorIndex = result.data.indexOf(CREATE_COMPOSABLE_ORDER_SELECTOR)
@@ -35,17 +28,24 @@ export async function fetchTwapOrdersFromSafe(
 
       const callData = '0x' + result.data.substring(selectorIndex)
 
-      const params = parseConditionalOrderParams(safeAddress, composableCowContract, callData)
+      const conditionalOrderParams = parseConditionalOrderParams(safeAddress, composableCowContract, callData)
 
-      if (!params) return null
+      if (!conditionalOrderParams) return null
 
-      const { isExecuted, submissionDate, executionDate } = result
+      const { isExecuted, submissionDate, executionDate, nonce, confirmationsRequired, confirmations, safeTxHash } =
+        result
 
       return {
-        params,
-        isExecuted,
-        submissionDate,
-        executionDate,
+        conditionalOrderParams,
+        safeTxParams: {
+          isExecuted,
+          submissionDate,
+          executionDate,
+          confirmationsRequired,
+          confirmations: confirmations?.length || 0,
+          safeTxHash,
+          nonce,
+        },
       }
     })
     .filter(isTruthy)
diff --git a/src/modules/twap/state/twapOrdersListAtom.ts b/src/modules/twap/state/twapOrdersListAtom.ts
index 43533bb153..70cb99cf13 100644
--- a/src/modules/twap/state/twapOrdersListAtom.ts
+++ b/src/modules/twap/state/twapOrdersListAtom.ts
@@ -13,7 +13,7 @@ import { updateTwapOrdersList } from '../utils/updateTwapOrdersList'
 
 export type TwapOrdersList = { [key: string]: TwapOrderItem }
 
-export const twapOrdersListAtom = atomWithStorage<TwapOrdersList>('twap-orders-list:v3', {})
+export const twapOrdersListAtom = atomWithStorage<TwapOrdersList>('twap-orders-list:v4', {})
 
 export const updateTwapOrdersListAtom = atom(null, (get, set, nextState: TwapOrdersList) => {
   const currentState = get(twapOrdersListAtom)
diff --git a/src/modules/twap/types.ts b/src/modules/twap/types.ts
index 61d1cf02f9..ad84b4c64c 100644
--- a/src/modules/twap/types.ts
+++ b/src/modules/twap/types.ts
@@ -1,7 +1,7 @@
 import { SupportedChainId } from '@cowprotocol/cow-sdk'
 import { CurrencyAmount, Token } from '@uniswap/sdk-core'
 
-import { TwapOrdersSafeData } from './services/fetchTwapOrdersFromSafe'
+import { SafeTransactionParams } from '../../common/types'
 
 // Read more: https://github.com/rndlabs/composable-cow#data-structure
 export interface TWAPOrder {
@@ -37,13 +37,19 @@ export enum TwapOrderStatus {
   Expired = 'Expired',
 }
 
+export interface TwapOrdersSafeData {
+  conditionalOrderParams: ConditionalOrderParams
+  safeTxParams: SafeTransactionParams
+}
+
 export interface TwapOrderItem {
   order: TWAPOrderStruct
   status: TwapOrderStatus
   chainId: SupportedChainId
+  submissionDate: string
   safeAddress: string
   id: string
-  submissionDate: string
+  safeTxParams?: SafeTransactionParams
 }
 
 export interface ConditionalOrderParams {
diff --git a/src/modules/twap/updaters/TwapOrdersUpdater.tsx b/src/modules/twap/updaters/TwapOrdersUpdater.tsx
index e9200e724a..3f811804f1 100644
--- a/src/modules/twap/updaters/TwapOrdersUpdater.tsx
+++ b/src/modules/twap/updaters/TwapOrdersUpdater.tsx
@@ -33,8 +33,8 @@ export function TwapOrdersUpdater(props: {
 
   const allOrdersInfo: TwapOrderInfo[] = useMemo(() => {
     return ordersSafeData.map((data) => {
-      const id = getConditionalOrderId(data.params)
-      const order = parseTwapOrderStruct(data.params.staticInput)
+      const id = getConditionalOrderId(data.conditionalOrderParams)
+      const order = parseTwapOrderStruct(data.conditionalOrderParams.staticInput)
 
       return {
         id,
@@ -54,7 +54,7 @@ export function TwapOrdersUpdater(props: {
         return TWAP_PENDING_STATUSES.includes(existingOrder.status)
       }
 
-      return !info.isExpired && info.safeData.isExecuted
+      return !info.isExpired && info.safeData.safeTxParams.isExecuted
     })
   }, [allOrdersInfo, twapOrdersList])
 
diff --git a/src/modules/twap/utils/buildTwapOrdersItems.ts b/src/modules/twap/utils/buildTwapOrdersItems.ts
index 3b2084f771..6788be02c7 100644
--- a/src/modules/twap/utils/buildTwapOrdersItems.ts
+++ b/src/modules/twap/utils/buildTwapOrdersItems.ts
@@ -6,9 +6,8 @@ import { getTwapOrderStatus } from './getTwapOrderStatus'
 import { parseTwapOrderStruct } from './parseTwapOrderStruct'
 
 import { TwapToDiscreteOrders } from '../hooks/useTwapDiscreteOrders'
-import { TwapOrdersSafeData } from '../services/fetchTwapOrdersFromSafe'
 import { TwapOrdersList } from '../state/twapOrdersListAtom'
-import { TwapOrderItem, TwapOrderInfo, TwapOrdersAuthResult } from '../types'
+import { TwapOrderItem, TwapOrderInfo, TwapOrdersAuthResult, TwapOrdersSafeData } from '../types'
 
 export function buildTwapOrdersItems(
   chainId: SupportedChainId,
@@ -31,10 +30,11 @@ function getTwapOrderItem(
   authorized: boolean | undefined,
   discreteOrder: Order | undefined
 ): TwapOrderItem {
-  const { params, isExecuted, submissionDate } = safeData
+  const { conditionalOrderParams, safeTxParams } = safeData
+  const { isExecuted, submissionDate } = safeTxParams
 
-  const executionDate = new Date(safeData.executionDate)
-  const order = parseTwapOrderStruct(params.staticInput)
+  const executionDate = new Date(safeTxParams.executionDate)
+  const order = parseTwapOrderStruct(conditionalOrderParams.staticInput)
   const status = getTwapOrderStatus(order, isExecuted, executionDate, authorized, discreteOrder)
 
   return {
@@ -44,5 +44,6 @@ function getTwapOrderItem(
     safeAddress,
     id,
     submissionDate,
+    safeTxParams,
   }
 }
diff --git a/src/modules/wallet/api/assets/safe-logo.svg b/src/modules/wallet/api/assets/safe-logo.svg
new file mode 100644
index 0000000000..9044e15fc0
--- /dev/null
+++ b/src/modules/wallet/api/assets/safe-logo.svg
@@ -0,0 +1,10 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+  <circle cx="10" cy="10" r="10" fill="#76FA8E"/>
+  <rect x="3.55566" y="3.3335" width="13.1111" height="13.1111" fill="url(#pattern0)"/>
+  <defs>
+    <pattern id="pattern0" patternContentUnits="objectBoundingBox" width="1" height="1">
+      <use xlink:href="#image0_466_4489" transform="scale(0.00555556)"/>
+    </pattern>
+    <image id="image0_466_4489" width="180" height="180" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAALQAAAC0CAMAAAAKE/YAAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAACYVBMVEUAAAARERESEhISFBISFBISFBIRExESEhISFBIREREPDw8SExISExISEhIQFRARFBESExISEhIAAAASFBISEhIAAAATExMSExISExIcHBwSExIUFBQRExESExIRExETExMUFBQAAAAQFBAMGAwRFBEPFg8TExMTExMRExESExITExMPFw8SExISExISExIVFRUTExMRExESEhISExIUFBQgICARExESEhIRExESExISExISExISExISEhISEhISExISFBISEhITExMSExISExIUFBQRExESExIRExETExMSFBIRFBESExISEhISExITExMAAAARERESExISEhISEhISFBISExIODg4TExMUFBQREREVFRUSEhISEhISFBISExISEhIXFxcUFBQTExMSExIRFRESExITExMSEhITExMTExMSExISExIVFRUTExMRERERERETExMRExESEhIUFBQSExITExMXFxcSExIAAAASExIAJAAWFhYSFBITExMSExISExISEhITExMSExISExISExISExIQEBARExESExISExISExISEhIQEBASExISEhISFBIQEBAUFBQTExMSExITExMRExEAAAARFBESExISFBIRERERExESEhINDQ0SEhITExMSEhITExMTExMSExITExMTExMQEBATExMSExISFBIRExESExIaGhoQFRATExMRExESExIRExESExISFBIRFRENDQ0SExISEhISEhISExITExMRFBETExMSFBIRExESExITExMTExMRExESExISExISExITExMRERESExL///8WnFqrAAAAyXRSTlMAD1aCnKqhimYeIaD6wT5a9ZkGdLQET/2QCeE0aq6/+A0BPxVbIzVRkuNtIu3X9ww2ryr8MghccneDn9qRK6f0t4yXuMVBota+pY9N1WHUawMu8DlFjvMSYEAsGGSmw9ndFhmW+T3o6khDKPHvJLMtPDeTzybsiAv+At8HF41f9rxvh8fk8qsvhszpuXAfrIvrIDPc5bKEBWjngTvNfRPQe5h6iZ5elRB5y3N44goxbIWdaeDRShS9VRz7REzOtrDJo1Db7ru6pEn847MMAAAAAWJLR0TK87Q25gAAAAlwSFlzAAAG6wAABusBTDGeSgAAAAd0SU1FB+YIGA04GksxsFwAAARxSURBVHja7d33V9RAEAfwxYINFU/xLOAh2BALeiKIioIVK3ZEEVQURRGxUAQBEQsq2Hsv2HvvveW/Up4Fy91m3JvNbnzz/X1nPtzLBbKZBMYoFAqF8nf8GjRs1Bg1/k2aNpNKbt4iwJCRlq3kmVsHSiHXpY1DkrmtNPLXtAuSYm7vlIk2Osgwd+wk1Ww4O0tAB8s1G0aIBHQX2WhXKLq5q0s22ghDR4dLNxvd0NHd5aODCU1oQhOa0IQmNKEJbTW6hx3RPe2I7mVDdFCEDdG95ZuN1sjmyD4WoJEvbMP7WmDu1x/VHCV5c+lbBmCSB/q7rTA7Bwn6osMGx8T+liFxQ60Qf80wMfLw+BEWAT1kpNBWb1CC3K1cfhKFNtUdoxSSR48ROzbG/kMP97jxeDeKkiYER4qR2UQ4edLkcMEm2JkCJbumJqu2/sg0qHn6DNXU+sQAzQEzVUt/yQQgepZq6K8Bnjtmz1ENFUDHq3aKoFNUO0XQc1U7RdCpqp0i6IGqnYQmNKEJTej/Dz1ctZPQhCY0oa1Dm18EzJuftiA948+kL0iavFBX9KLFmV7XuoZhs3HQS5ZyV2cJ7o1KRS8zG2PPXK4dOnuF6fqVObqhIbvyqxSgczklVoMq5On1Sa8BVUjQ65OeBKqwFhEdB0Ov45Qw/xrWZT0iOh+GLvBewQGrUFiEh54P6riBU6EYhjaS8dAloNvfG/VCswGAfgG8Q1oFOgfwcAXvg1aCZg1M74y3LNYOzUrL+N3a+XGXq0GzaeWcXlmbTM5VitCM5VVsrvTw5+WWvltTQs3WKkP7EjT0tu1VOzysy4zYuWuepujqmkLvawN3d9QRPWYPf/Xavfqh95kOUe1HvTrGQIceMF9/UDf0IUgBzOENBHRyFqRAjV7oMFCBQMQnzA8Xglo6Ob9Yj8B+bNHZMk9ZD+p4lFPhGAx9HBF9AtRxM6dCBQyNOb8B+uobJ/VCp0JGVd28ix8FaNYC0DCRV0AFusR8nj3jlG5olmv2tENWNne9EjSLPM3tVlXNX64GzRzBlV57dWp62GS1IjRjRXlnznoYkk4818N8P0wZ2pcQmtCE1iCEJjShNQihCU1oDWJL9Hk7oi/YEV1uQ3T/Mhuia2FmCS8wFE/0BiBap4HXi0Bz4SXV0vpcBpqNK6qlP+MHf9b+qmrr91Rfg937qMv1G4JNbt663QYtd1bBJvq+xb1MSOy4e+8fmiDHeUTI3P2+OrLR54GQOdWK1wR5ydFDYme7hxYdGmWPGuX/ntjaKNHhycWWkKseRwv6POXJUwvIrk1dEcnWvKzL9QyVzNhWC9ClyGY2Wr65C7YZOI3uU57bEL2l2Hel5egX6GYL0C/tiH5FaEITmtCEJjShCU1oy9GvpaPf4KNDpKMr8NGx0tFv8dE5sMF/8YwQ3X3mJU0y+pgEM2sG37IXyTvcN5T/yJJ+Es3vs30HeswgeZu96fLeAjbnvJz/R7nyXIHvOO8p6Lkx7QNqPn5q8hlzS5pCoVD+s3wBvqtwBIOTVFoAAAAldEVYdGRhdGU6Y3JlYXRlADIwMjItMDgtMjRUMTM6NTY6MjYrMDA6MDBWGQ1NAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDIyLTA4LTI0VDEzOjU2OjI2KzAwOjAwJ0S18QAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAABXelRYdFJhdyBwcm9maWxlIHR5cGUgaXB0YwAAeJzj8gwIcVYoKMpPy8xJ5VIAAyMLLmMLEyMTS5MUAxMgRIA0w2QDI7NUIMvY1MjEzMQcxAfLgEigSi4A6hcRdPJCNZUAAAAASUVORK5CYII="/>
+  </defs>
+</svg>

From 2851c6599f3bd04d4db129ecb8b6addd2a5e0ad5 Mon Sep 17 00:00:00 2001
From: Alexandr Kazachenko <shoom3301@gmail.com>
Date: Thu, 15 Jun 2023 16:10:08 +0600
Subject: [PATCH 22/67] feat(twap): setup fallback handler and wallet
 validation UI (#2669)

---
 src/common/pure/InlineBanner/banners.tsx      |  81 ++++++-------
 src/common/pure/InlineBanner/index.cosmos.tsx |  45 ++++----
 src/common/pure/InlineBanner/index.tsx        |   9 +-
 .../ordersTable/pure/ReceiptModal/index.tsx   |  13 +--
 .../services/validateTradeForm.ts             |  32 +++---
 src/modules/tradeFormValidation/types.ts      |  10 +-
 .../twap/containers/ActionButtons/index.tsx   |  30 +++--
 .../containers/TwapConfirmModal/index.tsx     |   8 +-
 .../containers/TwapFormWarnings/index.tsx     |  46 ++++++++
 .../warnings/FallbackHandlerWarning.tsx       |  74 ++++++++++++
 .../warnings/UnsupportedWalletWarning.tsx     |  29 +++++
 .../twap/containers/TwapFormWidget/index.tsx  |  18 ++-
 src/modules/twap/hooks/useCreateTwapOrder.ts  | 108 +++++++++++-------
 .../hooks/useExtensibleFallbackContext.ts     |  11 +-
 .../twap/hooks/useSetupFallbackHandler.ts     |  15 ---
 src/modules/twap/hooks/useTwapFormState.ts    |   7 +-
 .../twap/hooks/useTwapOrderCreationContext.ts |   8 +-
 .../PrimaryActionButton/getTwapFormState.tsx  |  23 ++--
 .../twap/pure/PrimaryActionButton/index.tsx   |  21 ++--
 .../twap/services/createTwapOrderTxs.test.ts  |   1 -
 .../extensibleFallbackSetupTxs.test.tsx       |   2 +-
 .../services/extensibleFallbackSetupTxs.ts    |   3 +-
 .../services/getSignatureVerifierContract.ts  |   3 +-
 .../twap/services/settleTwapOrder.test.ts     |  84 --------------
 src/modules/twap/services/settleTwapOrder.ts  |  18 ---
 .../setupExtensibleFallbackHandler.test.ts    |  80 -------------
 .../setupExtensibleFallbackHandler.ts         |  19 ---
 .../services/verifyExtensibleFallback.test.ts |   2 +-
 .../twap/services/verifyExtensibleFallback.ts |   3 +-
 .../twap/state/twapOrdersSettingsAtom.ts      |   2 +
 30 files changed, 383 insertions(+), 422 deletions(-)
 create mode 100644 src/modules/twap/containers/TwapFormWarnings/index.tsx
 create mode 100644 src/modules/twap/containers/TwapFormWarnings/warnings/FallbackHandlerWarning.tsx
 create mode 100644 src/modules/twap/containers/TwapFormWarnings/warnings/UnsupportedWalletWarning.tsx
 delete mode 100644 src/modules/twap/hooks/useSetupFallbackHandler.ts
 delete mode 100644 src/modules/twap/services/settleTwapOrder.test.ts
 delete mode 100644 src/modules/twap/services/settleTwapOrder.ts
 delete mode 100644 src/modules/twap/services/setupExtensibleFallbackHandler.test.ts
 delete mode 100644 src/modules/twap/services/setupExtensibleFallbackHandler.ts

diff --git a/src/common/pure/InlineBanner/banners.tsx b/src/common/pure/InlineBanner/banners.tsx
index 6d3baca7eb..0097e78d95 100644
--- a/src/common/pure/InlineBanner/banners.tsx
+++ b/src/common/pure/InlineBanner/banners.tsx
@@ -10,15 +10,12 @@ import { InlineBanner } from './index'
 
 export function BundleTxApprovalBanner() {
   return (
-    <InlineBanner
-      type="information"
-      content={
-        <>
-          <strong>Token approval</strong>: For your convenience, token approval and order placement will be bundled into
-          a single transaction, streamlining your experience!
-        </>
-      }
-    />
+    <InlineBanner type="information">
+      <>
+        <strong>Token approval</strong>: For your convenience, token approval and order placement will be bundled into a
+        single transaction, streamlining your experience!
+      </>
+    </InlineBanner>
   )
 }
 
@@ -29,16 +26,13 @@ export type BundleTxWrapBannerProps = {
 
 export function BundleTxWrapBanner({ nativeCurrencySymbol, wrappedCurrencySymbol }: BundleTxWrapBannerProps) {
   return (
-    <InlineBanner
-      type="information"
-      content={
-        <>
-          <strong>Token wrapping</strong>: For your convenience, CoW Swap will bundle all the necessary actions for this
-          trade into a single transaction. This includes the {nativeCurrencySymbol} wrapping and, if needed,{' '}
-          {wrappedCurrencySymbol} approval. Even if the trade fails, your wrapping and approval will be done!
-        </>
-      }
-    />
+    <InlineBanner type="information">
+      <>
+        <strong>Token wrapping</strong>: For your convenience, CoW Swap will bundle all the necessary actions for this
+        trade into a single transaction. This includes the {nativeCurrencySymbol} wrapping and, if needed,{' '}
+        {wrappedCurrencySymbol} approval. Even if the trade fails, your wrapping and approval will be done!
+      </>
+    </InlineBanner>
   )
 }
 
@@ -53,18 +47,15 @@ export function BundleTxSafeWcBanner({ nativeCurrencySymbol, supportsWrapping }:
   const supportsWrappingText = supportsWrapping ? `${nativeCurrencySymbol} wrapping, ` : ''
 
   return (
-    <InlineBanner
-      type="information"
-      content={
-        <>
-          Use the Safe web app for streamlined trading: {supportsWrappingText}token approval and orders bundled in one
-          go! Only available in the{' '}
-          <ExternalLink href="https://app.safe.global/share/safe-app?appUrl=https%3A%2F%2Fswap.cow.fi&chain=eth">
-            CoW Swap Safe App↗
-          </ExternalLink>
-        </>
-      }
-    />
+    <InlineBanner type="information">
+      <>
+        Use the Safe web app for streamlined trading: {supportsWrappingText}token approval and orders bundled in one go!
+        Only available in the{' '}
+        <ExternalLink href="https://app.safe.global/share/safe-app?appUrl=https%3A%2F%2Fswap.cow.fi&chain=eth">
+          CoW Swap Safe App↗
+        </ExternalLink>
+      </>
+    </InlineBanner>
   )
 }
 
@@ -75,20 +66,18 @@ export type SmallVolumeWarningBannerProps = {
 
 export function SmallVolumeWarningBanner({ feePercentage, feeAmount }: SmallVolumeWarningBannerProps) {
   return (
-    <InlineBanner
-      content={
-        <>
-          Small orders are unlikely to be executed. For this order, network fees would be{' '}
-          <b>
-            {feePercentage?.toFixed(2)}% (
-            <TokenAmount amount={feeAmount} tokenSymbol={feeAmount?.currency} />)
-          </b>{' '}
-          of your sell amount! Therefore, your order is unlikely to execute.
-          {/*<br />*/}
-          {/* TODO: add link to somewhere */}
-          {/*<a href="/">Learn more ↗</a>*/}
-        </>
-      }
-    />
+    <InlineBanner>
+      <>
+        Small orders are unlikely to be executed. For this order, network fees would be{' '}
+        <b>
+          {feePercentage?.toFixed(2)}% (
+          <TokenAmount amount={feeAmount} tokenSymbol={feeAmount?.currency} />)
+        </b>{' '}
+        of your sell amount! Therefore, your order is unlikely to execute.
+        {/*<br />*/}
+        {/* TODO: add link to somewhere */}
+        {/*<a href="/">Learn more ↗</a>*/}
+      </>
+    </InlineBanner>
   )
 }
diff --git a/src/common/pure/InlineBanner/index.cosmos.tsx b/src/common/pure/InlineBanner/index.cosmos.tsx
index d35f103b91..dda1795d9c 100644
--- a/src/common/pure/InlineBanner/index.cosmos.tsx
+++ b/src/common/pure/InlineBanner/index.cosmos.tsx
@@ -5,47 +5,50 @@ import { InlineBanner } from '.'
 const Fixtures = {
   'default (alert)': (
     <DemoContainer>
-      <InlineBanner content={<strong>This is an alert banner.</strong>} />
+      <InlineBanner>
+        <strong>This is an alert banner.</strong>
+      </InlineBanner>
     </DemoContainer>
   ),
   alert: (
     <DemoContainer>
-      <InlineBanner type="alert" content={<strong>This is an alert banner (explicitly passed type).</strong>} />
+      <InlineBanner type="alert">
+        <strong>This is an alert banner (explicitly passed type).</strong>
+      </InlineBanner>
     </DemoContainer>
   ),
   information: (
     <DemoContainer>
-      <InlineBanner
-        type="information"
-        content={
-          <>
-            <strong>Token approval</strong>: For your convenience, token approval and order placement will be bundled
-            into a single transaction, streamlining your experience!
-          </>
-        }
-      />
+      <InlineBanner type="information">
+        <>
+          <strong>Token approval</strong>: For your convenience, token approval and order placement will be bundled into
+          a single transaction, streamlining your experience!
+        </>
+      </InlineBanner>
     </DemoContainer>
   ),
   success: (
     <DemoContainer>
-      <InlineBanner type="success" content={<strong>Operation completed successfully!</strong>} />
+      <InlineBanner type="success">
+        <strong>Operation completed successfully!</strong>
+      </InlineBanner>
     </DemoContainer>
   ),
   danger: (
     <DemoContainer>
-      <InlineBanner type="danger" content={<strong>Something went wrong! Please try again.</strong>} />
+      <InlineBanner type="danger">
+        <strong>Something went wrong! Please try again.</strong>
+      </InlineBanner>
     </DemoContainer>
   ),
   smallVolumeWarning: (
     <DemoContainer>
-      <InlineBanner
-        content={
-          <>
-            Small orders are unlikely to be executed. For this order, network fees would be <b>1.00% (2500 COW)</b> of
-            your sell amount! Therefore, your order is unlikely to execute.
-          </>
-        }
-      />
+      <InlineBanner>
+        <>
+          Small orders are unlikely to be executed. For this order, network fees would be <b>1.00% (2500 COW)</b> of
+          your sell amount! Therefore, your order is unlikely to execute.
+        </>
+      </InlineBanner>
     </DemoContainer>
   ),
 }
diff --git a/src/common/pure/InlineBanner/index.tsx b/src/common/pure/InlineBanner/index.tsx
index 90147b9781..67a3fb7518 100644
--- a/src/common/pure/InlineBanner/index.tsx
+++ b/src/common/pure/InlineBanner/index.tsx
@@ -65,20 +65,21 @@ const Wrapper = styled.span<{ color: string }>`
 `
 
 export type InlineBannerProps = {
-  content: ReactNode
+  children?: ReactNode
   className?: string
+  hideIcon?: boolean
   type?: BannerType
 }
 
-export function InlineBanner({ content, className, type = 'alert' }: InlineBannerProps) {
+export function InlineBanner({ children, className, hideIcon, type = 'alert' }: InlineBannerProps) {
   const theme = useTheme()
   const config = BANNER_CONFIG[type]
   const color = theme[config.colorKey]
 
   return (
     <Wrapper className={className} color={color}>
-      <SVG src={config.icon} description={type} />
-      <span>{content}</span>
+      {!hideIcon && <SVG src={config.icon} description={type} />}
+      <span>{children}</span>
     </Wrapper>
   )
 }
diff --git a/src/modules/ordersTable/pure/ReceiptModal/index.tsx b/src/modules/ordersTable/pure/ReceiptModal/index.tsx
index 20d1c2939a..0edf3564d1 100644
--- a/src/modules/ordersTable/pure/ReceiptModal/index.tsx
+++ b/src/modules/ordersTable/pure/ReceiptModal/index.tsx
@@ -93,14 +93,11 @@ export function ReceiptModal({
 
         {twapOrder && (
           <styledEl.InfoBannerWrapper>
-            <InlineBanner
-              type="information"
-              content={
-                isTwapPartOrder
-                  ? `Part of a ${twapOrder.order.n}-part TWAP order split`
-                  : `TWAP order split into ${twapOrder.order.n} parts`
-              }
-            />
+            <InlineBanner type="information">
+              {isTwapPartOrder
+                ? `Part of a ${twapOrder.order.n}-part TWAP order split`
+                : `TWAP order split into ${twapOrder.order.n} parts`}
+            </InlineBanner>
           </styledEl.InfoBannerWrapper>
         )}
 
diff --git a/src/modules/tradeFormValidation/services/validateTradeForm.ts b/src/modules/tradeFormValidation/services/validateTradeForm.ts
index ab47164060..0ec6ff9224 100644
--- a/src/modules/tradeFormValidation/services/validateTradeForm.ts
+++ b/src/modules/tradeFormValidation/services/validateTradeForm.ts
@@ -36,22 +36,6 @@ export function validateTradeForm(context: TradeFormValidationContext): TradeFor
     return TradeFormValidation.WrapUnwrapFlow
   }
 
-  if (!inputCurrency || !outputCurrency) {
-    return TradeFormValidation.CurrencyNotSet
-  }
-
-  if (inputAmountIsNotSet) {
-    return TradeFormValidation.InputAmountNotSet
-  }
-
-  if (recipient && !recipientEnsAddress && !isAddress(recipient)) {
-    return TradeFormValidation.RecipientInvalid
-  }
-
-  if (isSwapUnsupported) {
-    return TradeFormValidation.CurrencyNotSupported
-  }
-
   if (tradeQuote.error) {
     return TradeFormValidation.QuoteErrors
   }
@@ -68,6 +52,22 @@ export function validateTradeForm(context: TradeFormValidationContext): TradeFor
     return TradeFormValidation.SafeReadonlyUser
   }
 
+  if (!inputCurrency || !outputCurrency) {
+    return TradeFormValidation.CurrencyNotSet
+  }
+
+  if (inputAmountIsNotSet) {
+    return TradeFormValidation.InputAmountNotSet
+  }
+
+  if (recipient && !recipientEnsAddress && !isAddress(recipient)) {
+    return TradeFormValidation.RecipientInvalid
+  }
+
+  if (isSwapUnsupported) {
+    return TradeFormValidation.CurrencyNotSupported
+  }
+
   if (!tradeQuote.response) {
     return TradeFormValidation.QuoteLoading
   }
diff --git a/src/modules/tradeFormValidation/types.ts b/src/modules/tradeFormValidation/types.ts
index 0ef075cf36..919ed40c4f 100644
--- a/src/modules/tradeFormValidation/types.ts
+++ b/src/modules/tradeFormValidation/types.ts
@@ -8,11 +8,6 @@ export enum TradeFormValidation {
   WrapUnwrapAmountNotSet,
   WrapUnwrapFlow,
 
-  // Quote request params
-  CurrencyNotSet,
-  InputAmountNotSet,
-  RecipientInvalid,
-
   // Quote errors
   QuoteErrors,
   CurrencyNotSupported,
@@ -22,6 +17,11 @@ export enum TradeFormValidation {
   WalletNotSupported,
   SafeReadonlyUser,
 
+  // Quote request params
+  CurrencyNotSet,
+  InputAmountNotSet,
+  RecipientInvalid,
+
   // Quote loading indicator
   QuoteLoading,
 
diff --git a/src/modules/twap/containers/ActionButtons/index.tsx b/src/modules/twap/containers/ActionButtons/index.tsx
index 0de5f4376e..1f91b66f36 100644
--- a/src/modules/twap/containers/ActionButtons/index.tsx
+++ b/src/modules/twap/containers/ActionButtons/index.tsx
@@ -1,31 +1,37 @@
 import React from 'react'
 
 import { useTradeConfirmActions } from 'modules/trade'
-import { TradeFormButtons, useGetTradeFormValidation } from 'modules/tradeFormValidation'
+import { TradeFormButtons, TradeFormValidation } from 'modules/tradeFormValidation'
 import { useTradeFormButtonContext } from 'modules/tradeFormValidation'
 
-import { useSetupFallbackHandler } from '../../hooks/useSetupFallbackHandler'
-import { useTwapFormState } from '../../hooks/useTwapFormState'
 import { PrimaryActionButton } from '../../pure/PrimaryActionButton'
+import { TwapFormState } from '../../pure/PrimaryActionButton/getTwapFormState'
 
-export function ActionButtons() {
-  const setFallbackHandler = useSetupFallbackHandler()
+interface ActionButtonsProps {
+  localFormValidation: TwapFormState | null
+  primaryFormValidation: TradeFormValidation | null
+  walletIsNotConnected: boolean
+}
+
+export function ActionButtons({
+  localFormValidation,
+  primaryFormValidation,
+  walletIsNotConnected,
+}: ActionButtonsProps) {
   const tradeConfirmActions = useTradeConfirmActions()
-  const localFormValidation = useTwapFormState()
-  const primaryFormValidation = useGetTradeFormValidation()
+
+  const confirmTrade = tradeConfirmActions.onOpen
 
   const primaryActionContext = {
-    setFallbackHandler,
-    openConfirmModal: tradeConfirmActions.onOpen,
+    confirmTrade,
   }
 
-  const confirmTrade = tradeConfirmActions.onOpen
-
   const tradeFormButtonContext = useTradeFormButtonContext('TWAP order', { doTrade: confirmTrade, confirmTrade })
 
   if (!tradeFormButtonContext) return null
 
-  if (localFormValidation) {
+  // Show local form validation errors only when wallet is connected
+  if (localFormValidation && !walletIsNotConnected) {
     return <PrimaryActionButton state={localFormValidation} context={primaryActionContext} />
   }
 
diff --git a/src/modules/twap/containers/TwapConfirmModal/index.tsx b/src/modules/twap/containers/TwapConfirmModal/index.tsx
index 937344c24a..de181da5b4 100644
--- a/src/modules/twap/containers/TwapConfirmModal/index.tsx
+++ b/src/modules/twap/containers/TwapConfirmModal/index.tsx
@@ -14,7 +14,11 @@ import { partsStateAtom } from '../../state/partsStateAtom'
 import { twapOrderAtom } from '../../state/twapOrderAtom'
 import { twapOrderSlippage } from '../../state/twapOrdersSettingsAtom'
 
-export function TwapConfirmModal() {
+interface TwapConfirmModalProps {
+  fallbackHandlerIsNotSet: boolean
+}
+
+export function TwapConfirmModal({ fallbackHandlerIsNotSet }: TwapConfirmModalProps) {
   const {
     inputCurrencyAmount,
     inputCurrencyFiatAmount,
@@ -73,7 +77,7 @@ export function TwapConfirmModal() {
         title="Review TWAP order"
         inputCurrencyInfo={inputCurrencyInfo}
         outputCurrencyInfo={outputCurrencyInfo}
-        onConfirm={createTwapOrder}
+        onConfirm={() => createTwapOrder(fallbackHandlerIsNotSet)}
         onDismiss={tradeConfirmActions.onDismiss}
         isConfirmDisabled={isConfirmDisabled}
         priceImpact={priceImpact}
diff --git a/src/modules/twap/containers/TwapFormWarnings/index.tsx b/src/modules/twap/containers/TwapFormWarnings/index.tsx
new file mode 100644
index 0000000000..c8ca085add
--- /dev/null
+++ b/src/modules/twap/containers/TwapFormWarnings/index.tsx
@@ -0,0 +1,46 @@
+import { useAtomValue } from 'jotai'
+import { useUpdateAtom } from 'jotai/utils'
+import { useCallback } from 'react'
+
+import { FallbackHandlerWarning } from './warnings/FallbackHandlerWarning'
+import { UnsupportedWalletWarning } from './warnings/UnsupportedWalletWarning'
+
+import { useIsSafeViaWc } from '../../../wallet'
+import { NEED_FALLBACK_HANDLER_STATES, TwapFormState } from '../../pure/PrimaryActionButton/getTwapFormState'
+import { twapOrdersSettingsAtom, updateTwapOrdersSettingsAtom } from '../../state/twapOrdersSettingsAtom'
+
+interface TwapFormWarningsProps {
+  localFormValidation: TwapFormState | null
+  walletIsNotConnected: boolean
+}
+
+export function TwapFormWarnings({ localFormValidation, walletIsNotConnected }: TwapFormWarningsProps) {
+  const { isFallbackHandlerSetupAccepted } = useAtomValue(twapOrdersSettingsAtom)
+  const updateTwapOrdersSettings = useUpdateAtom(updateTwapOrdersSettingsAtom)
+  const isSafeViaWc = useIsSafeViaWc()
+
+  const toggleFallbackHandlerSetupFlag = useCallback(
+    (isFallbackHandlerSetupAccepted: boolean) => {
+      updateTwapOrdersSettings({ isFallbackHandlerSetupAccepted })
+    },
+    [updateTwapOrdersSettings]
+  )
+
+  // Don't display any warnings while a wallet is not connected
+  if (walletIsNotConnected) return null
+
+  if (localFormValidation === TwapFormState.NOT_SAFE) {
+    return <UnsupportedWalletWarning isSafeViaWc={isSafeViaWc} />
+  }
+
+  if (localFormValidation && NEED_FALLBACK_HANDLER_STATES.includes(localFormValidation)) {
+    return (
+      <FallbackHandlerWarning
+        isFallbackHandlerSetupAccepted={isFallbackHandlerSetupAccepted}
+        toggleFallbackHandlerSetupFlag={toggleFallbackHandlerSetupFlag}
+      />
+    )
+  }
+
+  return null
+}
diff --git a/src/modules/twap/containers/TwapFormWarnings/warnings/FallbackHandlerWarning.tsx b/src/modules/twap/containers/TwapFormWarnings/warnings/FallbackHandlerWarning.tsx
new file mode 100644
index 0000000000..943e9a09aa
--- /dev/null
+++ b/src/modules/twap/containers/TwapFormWarnings/warnings/FallbackHandlerWarning.tsx
@@ -0,0 +1,74 @@
+import styled from 'styled-components/macro'
+
+import { InlineBanner } from 'common/pure/InlineBanner'
+
+const CheckboxWrapper = styled.div`
+  font-weight: bold;
+  text-align: left;
+  margin-left: 25px;
+`
+
+const WarningCheckboxWrapper = styled(CheckboxWrapper)`
+  width: 90%;
+  margin: -50px auto 12px;
+  position: relative;
+  top: 70px;
+`
+
+const WarningCheckbox = styled.label`
+  display: flex;
+  gap: 5px;
+  cursor: pointer;
+`
+
+const InlineBannerWithCheckbox = styled(InlineBanner)`
+  padding-bottom: 80px;
+`
+
+interface FallbackHandlerWarningProps {
+  isFallbackHandlerSetupAccepted: boolean
+  toggleFallbackHandlerSetupFlag(isChecked: boolean): void
+}
+
+export function FallbackHandlerWarning({
+  isFallbackHandlerSetupAccepted,
+  toggleFallbackHandlerSetupFlag,
+}: FallbackHandlerWarningProps) {
+  const fallbackHandlerCheckbox = (
+    <WarningCheckbox>
+      <input
+        type="checkbox"
+        checked={isFallbackHandlerSetupAccepted}
+        onChange={(event) => toggleFallbackHandlerSetupFlag(event.currentTarget.checked)}
+      />
+      <span>
+        Modify Safe's fallback handler
+        <br /> when placing order
+      </span>
+    </WarningCheckbox>
+  )
+
+  if (isFallbackHandlerSetupAccepted) {
+    return (
+      <div>
+        <InlineBanner hideIcon={true} type="information">
+          <CheckboxWrapper>{fallbackHandlerCheckbox}</CheckboxWrapper>
+        </InlineBanner>
+      </div>
+    )
+  } else {
+    return (
+      <div>
+        <InlineBannerWithCheckbox type="alert">
+          <strong>Unsupported Safe detected</strong>
+          <br />
+          Connected Safe lacks required fallback handler. Switch to a compatible Safe or modify fallback handler for
+          TWAP orders when placing your order.{' '}
+          {/*<HashLink to="/faq/limit-order#how-do-fees-work">Learn more</HashLink>*/}
+          {/*TODO: set a proper link*/}
+          <WarningCheckboxWrapper>{fallbackHandlerCheckbox}</WarningCheckboxWrapper>
+        </InlineBannerWithCheckbox>
+      </div>
+    )
+  }
+}
diff --git a/src/modules/twap/containers/TwapFormWarnings/warnings/UnsupportedWalletWarning.tsx b/src/modules/twap/containers/TwapFormWarnings/warnings/UnsupportedWalletWarning.tsx
new file mode 100644
index 0000000000..520013db54
--- /dev/null
+++ b/src/modules/twap/containers/TwapFormWarnings/warnings/UnsupportedWalletWarning.tsx
@@ -0,0 +1,29 @@
+import { ExternalLink } from 'legacy/theme'
+
+import { InlineBanner } from 'common/pure/InlineBanner'
+
+export function UnsupportedWalletWarning({ isSafeViaWc }: { isSafeViaWc: boolean }) {
+  if (isSafeViaWc) {
+    return (
+      <InlineBanner type="information">
+        <>
+          Use the Safe web app for advanced trading. Only available in the{' '}
+          <ExternalLink href="https://app.safe.global/share/safe-app?appUrl=https%3A%2F%2Fswap.cow.fi&chain=eth">
+            CoW Swap Safe App↗
+          </ExternalLink>
+        </>
+      </InlineBanner>
+    )
+  }
+
+  return (
+    <InlineBanner type="alert">
+      <strong>Unsupported wallet detected:</strong> TWAP orders currently require a Safe with a special fallback
+      handler. <br />
+      Have one? Switch to it! {/*Need setup? <HashLink to="/faq/limit-order#how-do-fees-work">Click here</HashLink>.*/}{' '}
+      <br />
+      Future updates may extend wallet support!
+      {/*TODO: set a proper link*/}
+    </InlineBanner>
+  )
+}
diff --git a/src/modules/twap/containers/TwapFormWidget/index.tsx b/src/modules/twap/containers/TwapFormWidget/index.tsx
index 28d170f25c..49bad11d24 100644
--- a/src/modules/twap/containers/TwapFormWidget/index.tsx
+++ b/src/modules/twap/containers/TwapFormWidget/index.tsx
@@ -8,6 +8,7 @@ import { useIsWrapOrUnwrap } from 'modules/trade/hooks/useIsWrapOrUnwrap'
 import { useTradeState } from 'modules/trade/hooks/useTradeState'
 import { TradeNumberInput } from 'modules/trade/pure/TradeNumberInput'
 import { TradeTextBox } from 'modules/trade/pure/TradeTextBox'
+import { TradeFormValidation, useGetTradeFormValidation } from 'modules/tradeFormValidation'
 import { QuoteObserverUpdater } from 'modules/twap/updaters/QuoteObserverUpdater'
 import { useIsSafeApp, useWalletInfo } from 'modules/wallet'
 
@@ -16,8 +17,10 @@ import { useRateInfoParams } from 'common/hooks/useRateInfoParams'
 import * as styledEl from './styled'
 
 import { DEFAULT_TWAP_SLIPPAGE, defaultNumOfParts, orderDeadlines } from '../../const'
+import { useTwapFormState } from '../../hooks/useTwapFormState'
 import { AmountParts } from '../../pure/AmountParts'
 import { DeadlineSelector } from '../../pure/DeadlineSelector'
+import { NEED_FALLBACK_HANDLER_STATES } from '../../pure/PrimaryActionButton/getTwapFormState'
 import { partsStateAtom } from '../../state/partsStateAtom'
 import { twapTimeIntervalAtom } from '../../state/twapOrderAtom'
 import { twapOrdersSettingsAtom, updateTwapOrdersSettingsAtom } from '../../state/twapOrdersSettingsAtom'
@@ -25,6 +28,7 @@ import { TwapOrdersUpdater } from '../../updaters/TwapOrdersUpdater'
 import { deadlinePartsDisplay } from '../../utils/deadlinePartsDisplay'
 import { ActionButtons } from '../ActionButtons'
 import { TwapConfirmModal } from '../TwapConfirmModal'
+import { TwapFormWarnings } from '../TwapFormWarnings'
 
 export function TwapFormWidget() {
   const { chainId, account } = useWalletInfo()
@@ -39,6 +43,9 @@ export function TwapFormWidget() {
   const partsState = useAtomValue(partsStateAtom)
   const timeInterval = useAtomValue(twapTimeIntervalAtom)
   const updateSettingsState = useUpdateAtom(updateTwapOrdersSettingsAtom)
+
+  const localFormValidation = useTwapFormState()
+  const primaryFormValidation = useGetTradeFormValidation()
   const isWrapOrUnwrap = useIsWrapOrUnwrap()
 
   const composableCowContract = useComposableCowContract()
@@ -51,6 +58,8 @@ export function TwapFormWidget() {
     isCustomDeadline,
   }
 
+  const walletIsNotConnected = primaryFormValidation === TradeFormValidation.WalletNotConnected
+  const fallbackHandlerIsNotSet = !!localFormValidation && NEED_FALLBACK_HANDLER_STATES.includes(localFormValidation)
   const shouldLoadTwapOrders = !!(isSafeApp && chainId && account && composableCowContract)
 
   // Reset output amount when num of parts or input amount are changed
@@ -64,7 +73,7 @@ export function TwapFormWidget() {
       {shouldLoadTwapOrders && (
         <TwapOrdersUpdater composableCowContract={composableCowContract} safeAddress={account} chainId={chainId} />
       )}
-      <TwapConfirmModal />
+      <TwapConfirmModal fallbackHandlerIsNotSet={fallbackHandlerIsNotSet} />
 
       {!isWrapOrUnwrap && (
         <styledEl.Row>
@@ -109,7 +118,12 @@ export function TwapFormWidget() {
         </TradeTextBox>
       </styledEl.DeadlineRow>
 
-      <ActionButtons />
+      <TwapFormWarnings localFormValidation={localFormValidation} walletIsNotConnected={walletIsNotConnected} />
+      <ActionButtons
+        localFormValidation={localFormValidation}
+        primaryFormValidation={primaryFormValidation}
+        walletIsNotConnected={walletIsNotConnected}
+      />
     </>
   )
 }
diff --git a/src/modules/twap/hooks/useCreateTwapOrder.ts b/src/modules/twap/hooks/useCreateTwapOrder.ts
index 441f38ed53..261dbcd989 100644
--- a/src/modules/twap/hooks/useCreateTwapOrder.ts
+++ b/src/modules/twap/hooks/useCreateTwapOrder.ts
@@ -11,9 +11,12 @@ import { useAdvancedOrdersDerivedState } from 'modules/advancedOrders'
 import { useTradeConfirmActions } from 'modules/trade'
 import { useWalletInfo } from 'modules/wallet'
 
+import { useExtensibleFallbackContext } from './useExtensibleFallbackContext'
 import { useTwapOrderCreationContext } from './useTwapOrderCreationContext'
 
-import { settleTwapOrder } from '../services/settleTwapOrder'
+import { useSafeAppsSdk } from '../../wallet/web3-react/hooks/useSafeAppsSdk'
+import { createTwapOrderTxs } from '../services/createTwapOrderTxs'
+import { extensibleFallbackSetupTxs } from '../services/extensibleFallbackSetupTxs'
 import { twapOrderAtom } from '../state/twapOrderAtom'
 import { addTwapOrderToListAtom } from '../state/twapOrdersListAtom'
 import { TwapOrderStatus } from '../types'
@@ -28,50 +31,69 @@ export function useCreateTwapOrder() {
 
   const { inputCurrencyAmount, outputCurrencyAmount } = useAdvancedOrdersDerivedState()
 
+  const safeAppsSdk = useSafeAppsSdk()
   const twapOrderCreationContext = useTwapOrderCreationContext(inputCurrencyAmount as Nullish<CurrencyAmount<Token>>)
+  const extensibleFallbackContext = useExtensibleFallbackContext()
 
   const tradeConfirmActions = useTradeConfirmActions()
 
-  return useCallback(async () => {
-    if (!chainId || !account) return
-    if (!inputCurrencyAmount || !outputCurrencyAmount || !twapOrderCreationContext || !twapOrder) return
-
-    const pendingTrade = {
-      inputAmount: inputCurrencyAmount,
-      outputAmount: outputCurrencyAmount,
-    }
-
-    const startTime = Math.round((Date.now() + ms`1m`) / 1000) // Now + 1 min
-    const twapOrderWithStartTime = { ...twapOrder, startTime }
-    const paramsStruct = buildTwapOrderParamsStruct(chainId, twapOrderWithStartTime)
-    const orderId = getConditionalOrderId(paramsStruct)
-
-    tradeConfirmActions.onSign(pendingTrade)
-
-    try {
-      const { safeTxHash } = await settleTwapOrder(twapOrderWithStartTime, paramsStruct, twapOrderCreationContext)
-
-      addTwapOrderToList({
-        order: twapOrderToStruct(twapOrder),
-        status: TwapOrderStatus.WaitSigning,
-        chainId,
-        safeAddress: account,
-        submissionDate: new Date().toISOString(),
-        id: orderId,
-      })
-
-      tradeConfirmActions.onSuccess(safeTxHash)
-    } catch (error) {
-      tradeConfirmActions.onError(error.message || error)
-    }
-  }, [
-    chainId,
-    account,
-    inputCurrencyAmount,
-    outputCurrencyAmount,
-    twapOrder,
-    tradeConfirmActions,
-    twapOrderCreationContext,
-    addTwapOrderToList,
-  ])
+  return useCallback(
+    async (fallbackHandlerIsNotSet: boolean) => {
+      if (!chainId || !account) return
+      if (
+        !inputCurrencyAmount ||
+        !outputCurrencyAmount ||
+        !twapOrderCreationContext ||
+        !extensibleFallbackContext ||
+        !safeAppsSdk ||
+        !twapOrder
+      )
+        return
+
+      const pendingTrade = {
+        inputAmount: inputCurrencyAmount,
+        outputAmount: outputCurrencyAmount,
+      }
+
+      const startTime = Math.round((Date.now() + ms`1m`) / 1000) // Now + 1 min
+      const twapOrderWithStartTime = { ...twapOrder, startTime }
+      const paramsStruct = buildTwapOrderParamsStruct(chainId, twapOrderWithStartTime)
+      const orderId = getConditionalOrderId(paramsStruct)
+
+      tradeConfirmActions.onSign(pendingTrade)
+
+      try {
+        const fallbackSetupTxs = fallbackHandlerIsNotSet
+          ? await extensibleFallbackSetupTxs(extensibleFallbackContext)
+          : []
+        const createOrderTxs = createTwapOrderTxs(twapOrderWithStartTime, paramsStruct, twapOrderCreationContext)
+        const { safeTxHash } = await safeAppsSdk.txs.send({ txs: [...fallbackSetupTxs, ...createOrderTxs] })
+
+        addTwapOrderToList({
+          order: twapOrderToStruct(twapOrder),
+          status: TwapOrderStatus.WaitSigning,
+          chainId,
+          safeAddress: account,
+          submissionDate: new Date().toISOString(),
+          id: orderId,
+        })
+
+        tradeConfirmActions.onSuccess(safeTxHash)
+      } catch (error) {
+        tradeConfirmActions.onError(error.message || error)
+      }
+    },
+    [
+      chainId,
+      account,
+      inputCurrencyAmount,
+      outputCurrencyAmount,
+      twapOrder,
+      tradeConfirmActions,
+      twapOrderCreationContext,
+      extensibleFallbackContext,
+      addTwapOrderToList,
+      safeAppsSdk,
+    ]
+  )
 }
diff --git a/src/modules/twap/hooks/useExtensibleFallbackContext.ts b/src/modules/twap/hooks/useExtensibleFallbackContext.ts
index 9123a894d8..6e7d0998f6 100644
--- a/src/modules/twap/hooks/useExtensibleFallbackContext.ts
+++ b/src/modules/twap/hooks/useExtensibleFallbackContext.ts
@@ -1,30 +1,27 @@
 import { SupportedChainId } from '@cowprotocol/cow-sdk'
 import { Web3Provider } from '@ethersproject/providers'
-import SafeAppsSDK from '@safe-global/safe-apps-sdk'
 import { useWeb3React } from '@web3-react/core'
 
 import { useGP2SettlementContract } from 'legacy/hooks/useContract'
 import { isSupportedChain } from 'legacy/utils/supportedChainId'
 
 import { useWalletInfo } from 'modules/wallet'
-import { useSafeAppsSdk } from 'modules/wallet/web3-react/hooks/useSafeAppsSdk'
 
 import { GPv2Settlement } from 'abis/types'
 
 export interface ExtensibleFallbackContext {
+  safeAddress: string
   chainId: SupportedChainId
-  safeAppsSdk: SafeAppsSDK
   settlementContract: GPv2Settlement
   provider: Web3Provider
 }
 
 export function useExtensibleFallbackContext(): ExtensibleFallbackContext | null {
-  const { chainId } = useWalletInfo()
-  const safeAppsSdk = useSafeAppsSdk()
+  const { chainId, account } = useWalletInfo()
   const settlementContract = useGP2SettlementContract()
   const { provider } = useWeb3React()
 
-  if (!safeAppsSdk || !settlementContract || !provider || !isSupportedChain(chainId)) return null
+  if (!account || !settlementContract || !provider || !isSupportedChain(chainId)) return null
 
-  return { safeAppsSdk, settlementContract, provider, chainId }
+  return { settlementContract, provider, chainId, safeAddress: account }
 }
diff --git a/src/modules/twap/hooks/useSetupFallbackHandler.ts b/src/modules/twap/hooks/useSetupFallbackHandler.ts
deleted file mode 100644
index 6883146868..0000000000
--- a/src/modules/twap/hooks/useSetupFallbackHandler.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { useCallback } from 'react'
-
-import { useExtensibleFallbackContext } from './useExtensibleFallbackContext'
-
-import { setupExtensibleFallbackHandler } from '../services/setupExtensibleFallbackHandler'
-
-export function useSetupFallbackHandler() {
-  const extensibleFallbackContext = useExtensibleFallbackContext()
-
-  return useCallback(() => {
-    if (!extensibleFallbackContext) return
-
-    setupExtensibleFallbackHandler(extensibleFallbackContext)
-  }, [extensibleFallbackContext])
-}
diff --git a/src/modules/twap/hooks/useTwapFormState.ts b/src/modules/twap/hooks/useTwapFormState.ts
index 32c7b2e0d3..a03df6b3ae 100644
--- a/src/modules/twap/hooks/useTwapFormState.ts
+++ b/src/modules/twap/hooks/useTwapFormState.ts
@@ -9,11 +9,12 @@ import { useIsSafeApp } from '../../wallet'
 import { getTwapFormState, TwapFormState } from '../pure/PrimaryActionButton/getTwapFormState'
 import { verifyExtensibleFallback } from '../services/verifyExtensibleFallback'
 import { twapOrderAtom } from '../state/twapOrderAtom'
+import { twapOrdersSettingsAtom } from '../state/twapOrdersSettingsAtom'
 
 export function useTwapFormState(): TwapFormState | null {
   const isSafeApp = useIsSafeApp()
   const extensibleFallbackContext = useExtensibleFallbackContext()
-
+  const { isFallbackHandlerSetupAccepted } = useAtomValue(twapOrdersSettingsAtom)
   const twapOrder = useAtomValue(twapOrderAtom)
 
   const verification = useAsyncMemo(
@@ -23,6 +24,6 @@ export function useTwapFormState(): TwapFormState | null {
   )
 
   return useMemo(() => {
-    return getTwapFormState({ isSafeApp, verification, twapOrder })
-  }, [isSafeApp, verification, twapOrder])
+    return getTwapFormState({ isSafeApp, isFallbackHandlerSetupAccepted, verification, twapOrder })
+  }, [isSafeApp, isFallbackHandlerSetupAccepted, verification, twapOrder])
 }
diff --git a/src/modules/twap/hooks/useTwapOrderCreationContext.ts b/src/modules/twap/hooks/useTwapOrderCreationContext.ts
index e6414d0235..02a300adf0 100644
--- a/src/modules/twap/hooks/useTwapOrderCreationContext.ts
+++ b/src/modules/twap/hooks/useTwapOrderCreationContext.ts
@@ -1,4 +1,3 @@
-import SafeAppsSDK from '@safe-global/safe-apps-sdk'
 import { CurrencyAmount, Token } from '@uniswap/sdk-core'
 
 import { Nullish } from 'types'
@@ -7,14 +6,12 @@ import { Erc20 } from 'legacy/abis/types'
 import { useTokenContract } from 'legacy/hooks/useContract'
 
 import { useComposableCowContract } from 'modules/advancedOrders/hooks/useComposableCowContract'
-import { useSafeAppsSdk } from 'modules/wallet/web3-react/hooks/useSafeAppsSdk'
 
 import { ComposableCoW } from 'abis/types'
 import { useNeedsApproval } from 'common/hooks/useNeedsApproval'
 import { useTradeSpenderAddress } from 'common/hooks/useTradeSpenderAddress'
 
 export interface TwapOrderCreationContext {
-  safeAppsSdk: SafeAppsSDK
   composableCowContract: ComposableCoW
   needsApproval: boolean
   spender: string
@@ -24,13 +21,12 @@ export interface TwapOrderCreationContext {
 export function useTwapOrderCreationContext(
   inputAmount: Nullish<CurrencyAmount<Token>>
 ): TwapOrderCreationContext | null {
-  const safeAppsSdk = useSafeAppsSdk()
   const composableCowContract = useComposableCowContract()
   const needsApproval = useNeedsApproval(inputAmount)
   const erc20Contract = useTokenContract(inputAmount?.currency.address)
   const spender = useTradeSpenderAddress()
 
-  if (!composableCowContract || !erc20Contract || !safeAppsSdk || !spender) return null
+  if (!composableCowContract || !erc20Contract || !spender) return null
 
-  return { safeAppsSdk, composableCowContract, erc20Contract, needsApproval, spender }
+  return { composableCowContract, erc20Contract, needsApproval, spender }
 }
diff --git a/src/modules/twap/pure/PrimaryActionButton/getTwapFormState.tsx b/src/modules/twap/pure/PrimaryActionButton/getTwapFormState.tsx
index 1b7a263e1d..c7954723c2 100644
--- a/src/modules/twap/pure/PrimaryActionButton/getTwapFormState.tsx
+++ b/src/modules/twap/pure/PrimaryActionButton/getTwapFormState.tsx
@@ -3,28 +3,35 @@ import { TWAPOrder } from '../../types'
 
 export interface TwapFormStateParams {
   isSafeApp: boolean
+  isFallbackHandlerSetupAccepted: boolean
   verification: ExtensibleFallbackVerification | null
   twapOrder: TWAPOrder | null
 }
 
 export enum TwapFormState {
-  LOADING_SAFE_INFO,
-  NOT_SAFE,
-  ORDER_NOT_SPECIFIED,
-  NEED_FALLBACK_HANDLER,
-  CAN_CREATE_ORDER,
+  LOADING_SAFE_INFO = 'LOADING_SAFE_INFO',
+  NOT_SAFE = 'NOT_SAFE',
+  NEED_FALLBACK_HANDLER = 'NEED_FALLBACK_HANDLER',
+  ACCEPTED_FALLBACK_HANDLER_SETUP = 'ACCEPTED_FALLBACK_HANDLER_SETUP',
 }
 
+export const NEED_FALLBACK_HANDLER_STATES = [
+  TwapFormState.NEED_FALLBACK_HANDLER,
+  TwapFormState.ACCEPTED_FALLBACK_HANDLER_SETUP,
+]
+
 export function getTwapFormState(props: TwapFormStateParams): TwapFormState | null {
-  const { isSafeApp, verification, twapOrder } = props
+  const { twapOrder, isSafeApp, isFallbackHandlerSetupAccepted, verification } = props
 
   if (!isSafeApp) return TwapFormState.NOT_SAFE
 
   if (verification === null) return TwapFormState.LOADING_SAFE_INFO
 
-  if (!twapOrder) return TwapFormState.ORDER_NOT_SPECIFIED
+  if (twapOrder && verification !== ExtensibleFallbackVerification.HAS_DOMAIN_VERIFIER) {
+    if (isFallbackHandlerSetupAccepted) {
+      return TwapFormState.ACCEPTED_FALLBACK_HANDLER_SETUP
+    }
 
-  if (verification !== ExtensibleFallbackVerification.HAS_DOMAIN_VERIFIER) {
     return TwapFormState.NEED_FALLBACK_HANDLER
   }
 
diff --git a/src/modules/twap/pure/PrimaryActionButton/index.tsx b/src/modules/twap/pure/PrimaryActionButton/index.tsx
index a6f99a75ff..7e08c6dd9a 100644
--- a/src/modules/twap/pure/PrimaryActionButton/index.tsx
+++ b/src/modules/twap/pure/PrimaryActionButton/index.tsx
@@ -6,11 +6,9 @@ import { ButtonSize } from 'legacy/theme/enum'
 import { TwapFormState } from './getTwapFormState'
 
 export interface PrimaryActionButtonContext {
-  openConfirmModal(): void
-  setFallbackHandler(): void
+  confirmTrade(): void
 }
 
-// TODO: set correct buttons text
 const buttonsMap: Record<TwapFormState, (context: PrimaryActionButtonContext) => JSX.Element> = {
   [TwapFormState.LOADING_SAFE_INFO]: () => (
     <ButtonPrimary disabled={true} buttonSize={ButtonSize.BIG}>
@@ -19,22 +17,17 @@ const buttonsMap: Record<TwapFormState, (context: PrimaryActionButtonContext) =>
   ),
   [TwapFormState.NOT_SAFE]: () => (
     <ButtonPrimary disabled={true} buttonSize={ButtonSize.BIG}>
-      Please, connect to Safe
+      Unsupported wallet
     </ButtonPrimary>
   ),
-  [TwapFormState.ORDER_NOT_SPECIFIED]: () => (
+  [TwapFormState.NEED_FALLBACK_HANDLER]: () => (
     <ButtonPrimary disabled={true} buttonSize={ButtonSize.BIG}>
-      Please, specify an order
+      Unsupported Safe
     </ButtonPrimary>
   ),
-  [TwapFormState.NEED_FALLBACK_HANDLER]: ({ setFallbackHandler }: PrimaryActionButtonContext) => (
-    <ButtonPrimary onClick={setFallbackHandler} buttonSize={ButtonSize.BIG}>
-      Set fallback handler
-    </ButtonPrimary>
-  ),
-  [TwapFormState.CAN_CREATE_ORDER]: ({ openConfirmModal }: PrimaryActionButtonContext) => (
-    <ButtonPrimary onClick={openConfirmModal} buttonSize={ButtonSize.BIG}>
-      Create TWAP order
+  [TwapFormState.ACCEPTED_FALLBACK_HANDLER_SETUP]: ({ confirmTrade }: PrimaryActionButtonContext) => (
+    <ButtonPrimary buttonSize={ButtonSize.BIG} onClick={confirmTrade}>
+      Review TWAP order
     </ButtonPrimary>
   ),
 }
diff --git a/src/modules/twap/services/createTwapOrderTxs.test.ts b/src/modules/twap/services/createTwapOrderTxs.test.ts
index 93ec86f47e..e80fb829eb 100644
--- a/src/modules/twap/services/createTwapOrderTxs.test.ts
+++ b/src/modules/twap/services/createTwapOrderTxs.test.ts
@@ -38,7 +38,6 @@ describe('Create TWAP order', () => {
     approveFn = jest.fn().mockReturnValue(APPROVE_TX_DATA)
 
     context = {
-      safeAppsSdk: null as any,
       composableCowContract: {
         interface: { encodeFunctionData: createCowFn },
         address: COMPOSABLE_COW_ADDRESS[chainId],
diff --git a/src/modules/twap/services/extensibleFallbackSetupTxs.test.tsx b/src/modules/twap/services/extensibleFallbackSetupTxs.test.tsx
index c255da2697..62d3a75d8d 100644
--- a/src/modules/twap/services/extensibleFallbackSetupTxs.test.tsx
+++ b/src/modules/twap/services/extensibleFallbackSetupTxs.test.tsx
@@ -9,7 +9,7 @@ describe('extensibleFallbackSetupTxs - service to generate transactions for Exte
   it('Should create a bundle of two transactions: setFallbackHandler and setDomainVerifier', async () => {
     const context: ExtensibleFallbackContext = {
       chainId: SupportedChainId.GOERLI,
-      safeAppsSdk: { safe: { getInfo: () => ({ safeAddress: '0xA12D770028d7072b80BAEb6A1df962cccfd1dddd' }) } } as any,
+      safeAddress: '0xA12D770028d7072b80BAEb6A1df962cccfd1dddd',
       settlementContract: {
         callStatic: { domainSeparator: () => '0xa5b986c2f5845d520bcb903639360b147735589732066cea24a3a59678025c94' },
       } as any,
diff --git a/src/modules/twap/services/extensibleFallbackSetupTxs.ts b/src/modules/twap/services/extensibleFallbackSetupTxs.ts
index f7b5c29383..e48bb2ce7b 100644
--- a/src/modules/twap/services/extensibleFallbackSetupTxs.ts
+++ b/src/modules/twap/services/extensibleFallbackSetupTxs.ts
@@ -7,9 +7,8 @@ import { getSignatureVerifierContract } from './getSignatureVerifierContract'
 import { ExtensibleFallbackContext } from '../hooks/useExtensibleFallbackContext'
 
 export async function extensibleFallbackSetupTxs(context: ExtensibleFallbackContext): Promise<MetaTransactionData[]> {
-  const { chainId, safeAppsSdk, settlementContract } = context
+  const { chainId, safeAddress, settlementContract } = context
 
-  const { safeAddress } = await safeAppsSdk.safe.getInfo()
   const domainSeparator = await settlementContract.callStatic.domainSeparator()
 
   const signatureVerifierContract = await getSignatureVerifierContract(context)
diff --git a/src/modules/twap/services/getSignatureVerifierContract.ts b/src/modules/twap/services/getSignatureVerifierContract.ts
index 423bfc0d6f..18c82dc1a5 100644
--- a/src/modules/twap/services/getSignatureVerifierContract.ts
+++ b/src/modules/twap/services/getSignatureVerifierContract.ts
@@ -8,8 +8,7 @@ import { ExtensibleFallbackContext } from '../hooks/useExtensibleFallbackContext
 export async function getSignatureVerifierContract(
   context: ExtensibleFallbackContext
 ): Promise<SignatureVerifierMuxer> {
-  const { safeAppsSdk, provider } = context
-  const { safeAddress } = await safeAppsSdk.safe.getInfo()
+  const { safeAddress, provider } = context
 
   return new Contract(safeAddress, SignatureVerifierMuxerABI, provider) as SignatureVerifierMuxer
 }
diff --git a/src/modules/twap/services/settleTwapOrder.test.ts b/src/modules/twap/services/settleTwapOrder.test.ts
deleted file mode 100644
index 8045d79570..0000000000
--- a/src/modules/twap/services/settleTwapOrder.test.ts
+++ /dev/null
@@ -1,84 +0,0 @@
-import { useUpdateAtom } from 'jotai/utils'
-import { useEffect } from 'react'
-
-import { SupportedChainId } from '@cowprotocol/cow-sdk'
-import { CurrencyAmount } from '@uniswap/sdk-core'
-
-import { renderHook } from '@testing-library/react-hooks'
-
-import { COW } from 'legacy/constants/tokens'
-import { useTokenContract } from 'legacy/hooks/useContract'
-import { WETH_GOERLI } from 'legacy/utils/goerli/constants'
-
-import { useComposableCowContract } from 'modules/advancedOrders/hooks/useComposableCowContract'
-import { walletInfoAtom } from 'modules/wallet/api/state'
-import { useSafeAppsSdk } from 'modules/wallet/web3-react/hooks/useSafeAppsSdk'
-
-import { useNeedsApproval } from 'common/hooks/useNeedsApproval'
-import { useTradeSpenderAddress } from 'common/hooks/useTradeSpenderAddress'
-
-import { settleTwapOrder } from './settleTwapOrder'
-
-import { COMPOSABLE_COW_ADDRESS } from '../../advancedOrders'
-import { useTwapOrderCreationContext } from '../hooks/useTwapOrderCreationContext'
-import { TWAPOrder } from '../types'
-import { buildTwapOrderParamsStruct } from '../utils/buildTwapOrderParamsStruct'
-
-jest.mock('modules/wallet/web3-react/hooks/useSafeAppsSdk')
-jest.mock('modules/advancedOrders/hooks/useComposableCowContract')
-jest.mock('common/hooks/useNeedsApproval')
-jest.mock('legacy/hooks/useContract')
-jest.mock('common/hooks/useTradeSpenderAddress')
-
-const chainId = SupportedChainId.GOERLI
-
-const order: TWAPOrder = {
-  sellAmount: CurrencyAmount.fromRawAmount(COW[chainId], 100_000_000),
-  buyAmount: CurrencyAmount.fromRawAmount(WETH_GOERLI, 5_000),
-  receiver: '0xca063a2ab07491ee991dcecb456d1265f842b568',
-  numOfParts: 5,
-  startTime: 1497076708,
-  timeInterval: 350,
-  span: 0,
-}
-
-const paramsStruct = buildTwapOrderParamsStruct(chainId, order)
-
-const useSafeAppsSdkMock = useSafeAppsSdk as jest.MockedFunction<typeof useSafeAppsSdk>
-const useComposableCowContractMock = useComposableCowContract as jest.MockedFunction<typeof useComposableCowContract>
-const useNeedsApprovalMock = useNeedsApproval as jest.MockedFunction<typeof useNeedsApproval>
-const useTokenContractMock = useTokenContract as jest.MockedFunction<typeof useTokenContract>
-const useTradeSpenderAddressMock = useTradeSpenderAddress as jest.MockedFunction<typeof useTradeSpenderAddress>
-
-describe('settleTwapOrder - integration test', () => {
-  beforeEach(() => {
-    jest.spyOn(Date, 'now').mockImplementation(() => 1497076708000)
-
-    useSafeAppsSdkMock.mockReturnValue({ txs: { send: () => Promise.resolve({ safeTxHash: '0x00b' }) } } as any)
-    useComposableCowContractMock.mockReturnValue({
-      interface: { encodeFunctionData: () => '0xCREATE_COW_TX_DATA' },
-      address: COMPOSABLE_COW_ADDRESS[chainId],
-    } as any)
-    useNeedsApprovalMock.mockReturnValue(true)
-    useTokenContractMock.mockReturnValue({ interface: { encodeFunctionData: () => '0xAPPROVE_TX_DATA' } } as any)
-    useTradeSpenderAddressMock.mockReturnValue('0xes8p7e9n3dbedr4e7caf8451050d1948be717679')
-  })
-
-  it('Should send a bundle of transactions to Safe with a TWAP order creation', async () => {
-    const { result } = renderHook(() => {
-      const updateWalletInfo = useUpdateAtom(walletInfoAtom)
-
-      useEffect(() => {
-        updateWalletInfo({ chainId })
-      }, [updateWalletInfo])
-
-      const context = useTwapOrderCreationContext(order.sellAmount)
-
-      if (!context) return null
-
-      return settleTwapOrder(order, paramsStruct, context)
-    })
-
-    expect(await result.current).toEqual({ safeTxHash: '0x00b' })
-  })
-})
diff --git a/src/modules/twap/services/settleTwapOrder.ts b/src/modules/twap/services/settleTwapOrder.ts
deleted file mode 100644
index e11efa71b6..0000000000
--- a/src/modules/twap/services/settleTwapOrder.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { SendTransactionsResponse } from '@safe-global/safe-apps-sdk'
-
-import { createTwapOrderTxs } from './createTwapOrderTxs'
-
-import { TwapOrderCreationContext } from '../hooks/useTwapOrderCreationContext'
-import { ConditionalOrderParams, TWAPOrder } from '../types'
-
-export async function settleTwapOrder(
-  order: TWAPOrder,
-  paramsStruct: ConditionalOrderParams,
-  context: TwapOrderCreationContext
-): Promise<SendTransactionsResponse> {
-  const { safeAppsSdk } = context
-
-  const txs = createTwapOrderTxs(order, paramsStruct, context)
-
-  return await safeAppsSdk.txs.send({ txs })
-}
diff --git a/src/modules/twap/services/setupExtensibleFallbackHandler.test.ts b/src/modules/twap/services/setupExtensibleFallbackHandler.test.ts
deleted file mode 100644
index 5b4ae4ad0b..0000000000
--- a/src/modules/twap/services/setupExtensibleFallbackHandler.test.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-import { useUpdateAtom } from 'jotai/utils'
-import { useEffect } from 'react'
-
-import { Web3Provider } from '@ethersproject/providers'
-import { useWeb3React } from '@web3-react/core'
-
-import { renderHook } from '@testing-library/react-hooks'
-import { WithMockedWeb3 } from 'test-utils'
-
-import { useGP2SettlementContract } from 'legacy/hooks/useContract'
-
-import { walletInfoAtom } from 'modules/wallet/api/state'
-import { useSafeAppsSdk } from 'modules/wallet/web3-react/hooks/useSafeAppsSdk'
-
-import { setupExtensibleFallbackHandler } from './setupExtensibleFallbackHandler'
-
-import { useExtensibleFallbackContext } from '../hooks/useExtensibleFallbackContext'
-
-const chainId = 5
-
-jest.mock('modules/wallet/web3-react/hooks/useSafeAppsSdk')
-jest.mock('legacy/hooks/useContract')
-jest.mock('@web3-react/core', () => {
-  return {
-    ...jest.requireActual('@web3-react/core'),
-    useWeb3React: jest.fn(),
-  }
-})
-
-const defaultJsonRpcHandler = (method: string, params?: any[]) => {
-  if (method === 'eth_chainId') return Promise.resolve(5)
-
-  // domainVerifiers()
-  if (method === 'eth_call' && params?.[0]?.data?.startsWith('0x51cad5ee')) {
-    //Composable cow address
-    return Promise.resolve('0x000000000000000000000000a31b99bd44528c7bae9e1f675d810ae13b0e29aa')
-  }
-
-  return Promise.resolve(null)
-}
-
-const useWeb3ReactMock = useWeb3React as jest.MockedFunction<typeof useWeb3React>
-const useSafeAppsSdkMock = useSafeAppsSdk as jest.MockedFunction<typeof useSafeAppsSdk>
-const useGP2SettlementContractMock = useGP2SettlementContract as jest.MockedFunction<typeof useGP2SettlementContract>
-
-describe('setupExtensibleFallbackHandler - integration test', () => {
-  beforeEach(() => {
-    useWeb3ReactMock.mockReturnValue({ provider: new Web3Provider(defaultJsonRpcHandler) } as any)
-    useSafeAppsSdkMock.mockReturnValue({
-      safe: {
-        getInfo: () => ({ safeAddress: '0xA12D770028d7072b80BAEb6A1df962cccfd1dddd' }),
-      },
-      txs: { send: () => Promise.resolve({ safeTxHash: '0x00c' }) },
-    } as any)
-    useGP2SettlementContractMock.mockReturnValue({
-      callStatic: { domainSeparator: () => '0xa5b986c2f5845d520bcb903639360b147735589732066cea24a3a59678025c94' },
-    } as any)
-  })
-
-  it('Should create a bundle of transaction to setup fallback handler and domain verifier', async () => {
-    const { result } = renderHook(
-      () => {
-        const updateWalletInfo = useUpdateAtom(walletInfoAtom)
-
-        useEffect(() => {
-          updateWalletInfo({ chainId })
-        }, [updateWalletInfo])
-
-        const context = useExtensibleFallbackContext()
-
-        if (!context) return null
-
-        return setupExtensibleFallbackHandler(context)
-      },
-      { wrapper: WithMockedWeb3 }
-    )
-
-    expect(await result.current).toEqual({ safeTxHash: '0x00c' })
-  })
-})
diff --git a/src/modules/twap/services/setupExtensibleFallbackHandler.ts b/src/modules/twap/services/setupExtensibleFallbackHandler.ts
deleted file mode 100644
index 05c93f61ca..0000000000
--- a/src/modules/twap/services/setupExtensibleFallbackHandler.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { SendTransactionsResponse } from '@safe-global/safe-apps-sdk'
-
-import { extensibleFallbackSetupTxs } from './extensibleFallbackSetupTxs'
-
-import { ExtensibleFallbackContext } from '../hooks/useExtensibleFallbackContext'
-
-export async function setupExtensibleFallbackHandler(
-  context: ExtensibleFallbackContext
-): Promise<SendTransactionsResponse> {
-  const { safeAppsSdk } = context
-
-  const txs = await extensibleFallbackSetupTxs(context)
-  const response = await safeAppsSdk.txs.send({ txs })
-
-  // TODO: process the sent transaction
-  console.log('SET HANDLER: ', response)
-
-  return response
-}
diff --git a/src/modules/twap/services/verifyExtensibleFallback.test.ts b/src/modules/twap/services/verifyExtensibleFallback.test.ts
index 1cd5300a10..7e778389d0 100644
--- a/src/modules/twap/services/verifyExtensibleFallback.test.ts
+++ b/src/modules/twap/services/verifyExtensibleFallback.test.ts
@@ -12,7 +12,7 @@ const defaultJsonRpcHandler = (method: string) => {
 }
 const context: ExtensibleFallbackContext = {
   chainId: SupportedChainId.GOERLI,
-  safeAppsSdk: { safe: { getInfo: () => ({ safeAddress: '0x360Ba61Bc799edfa01e306f1eCCb2F6e0C3C8c8e' }) } } as any,
+  safeAddress: '0x360Ba61Bc799edfa01e306f1eCCb2F6e0C3C8c8e',
   settlementContract: {
     callStatic: { domainSeparator: () => '0xa5b986c2f5845d520bcb903639360b147735589732066cea24a3a59678025c94' },
   } as any,
diff --git a/src/modules/twap/services/verifyExtensibleFallback.ts b/src/modules/twap/services/verifyExtensibleFallback.ts
index caa2be5466..134a5d264b 100644
--- a/src/modules/twap/services/verifyExtensibleFallback.ts
+++ b/src/modules/twap/services/verifyExtensibleFallback.ts
@@ -16,9 +16,8 @@ export enum ExtensibleFallbackVerification {
 export async function verifyExtensibleFallback(
   context: ExtensibleFallbackContext
 ): Promise<ExtensibleFallbackVerification> {
-  const { chainId, safeAppsSdk, settlementContract } = context
+  const { chainId, safeAddress, settlementContract } = context
   const composableCowContractAddress = COMPOSABLE_COW_ADDRESS[chainId]
-  const { safeAddress } = await safeAppsSdk.safe.getInfo()
   const domainSeparator = await settlementContract.callStatic.domainSeparator()
 
   const signatureVerifierContract = await getSignatureVerifierContract(context)
diff --git a/src/modules/twap/state/twapOrdersSettingsAtom.ts b/src/modules/twap/state/twapOrdersSettingsAtom.ts
index 1faeae10ef..0a0af68e16 100644
--- a/src/modules/twap/state/twapOrdersSettingsAtom.ts
+++ b/src/modules/twap/state/twapOrdersSettingsAtom.ts
@@ -19,6 +19,7 @@ export interface TwapOrdersDeadline {
 export interface TwapOrdersSettingsState extends TwapOrdersDeadline {
   readonly numberOfPartsValue: number
   readonly slippageValue: number | null
+  readonly isFallbackHandlerSetupAccepted: boolean
 }
 
 export const defaultCustomDeadline: TwapOrdersDeadline['customDeadline'] = {
@@ -34,6 +35,7 @@ export const defaultTwapOrdersSettings: TwapOrdersSettingsState = {
   numberOfPartsValue: defaultNumOfParts,
   // null = auto
   slippageValue: null,
+  isFallbackHandlerSetupAccepted: false,
 }
 
 export const twapOrdersSettingsAtom = atomWithStorage<TwapOrdersSettingsState>(

From 9b60df40f12c98860185e8b331b170ea3b45e24d Mon Sep 17 00:00:00 2001
From: Leandro <alfetopito@users.noreply.github.com>
Date: Thu, 15 Jun 2023 07:44:21 -0700
Subject: [PATCH 23/67] feat(twap): validation and warnings - sell amount too
 small (#2661)

* refactor: remove duplicated entry for USDC

* feat: update button error msg when sell amount is too small

* refactor: use fiat amount from state rather than query it again

* refactor: move MINIMUM_PART_SELL_AMOUNT_FIAT to const

* refactor: move isSellAmountTooSmall to utils

* feat: add SmallPartVolumeWarningBanner

* feat: show warning when part amount < 5k

* feat: update banner text with text from design files

* refactor: use fiat amount from partsStateAtom

* fix: reduce gchain min part amount to 5 and goerli to 100

* Fix code style issues with Prettier

---------

Co-authored-by: Lint Action <lint-action@samuelmeuli.com>
---
 src/legacy/hooks/useStablecoinPrice/index.ts  |  3 +--
 src/modules/twap/const.ts                     | 10 ++++++-
 .../containers/TwapFormWarnings/index.tsx     | 10 ++++---
 .../warnings/SmallPartVolumeWarning.tsx       | 26 +++++++++++++++++++
 .../TwapFormWarnings/warnings/index.ts        |  3 +++
 src/modules/twap/hooks/useTwapFormState.ts    | 18 ++++++++++---
 .../PrimaryActionButton/getTwapFormState.tsx  | 15 ++++++++++-
 .../twap/pure/PrimaryActionButton/index.tsx   |  5 ++++
 .../twap/utils/isSellAmountTooSmall.ts        | 19 ++++++++++++++
 9 files changed, 99 insertions(+), 10 deletions(-)
 create mode 100644 src/modules/twap/containers/TwapFormWarnings/warnings/SmallPartVolumeWarning.tsx
 create mode 100644 src/modules/twap/containers/TwapFormWarnings/warnings/index.ts
 create mode 100644 src/modules/twap/utils/isSellAmountTooSmall.ts

diff --git a/src/legacy/hooks/useStablecoinPrice/index.ts b/src/legacy/hooks/useStablecoinPrice/index.ts
index 5d9832c857..6908a4991a 100644
--- a/src/legacy/hooks/useStablecoinPrice/index.ts
+++ b/src/legacy/hooks/useStablecoinPrice/index.ts
@@ -7,7 +7,7 @@ import { unstable_batchedUpdates as batchedUpdate } from 'react-dom'
 import { Nullish } from 'types'
 
 import { DEFAULT_NETWORK_FOR_LISTS } from 'legacy/constants/lists'
-import { USDC, USDC_MAINNET } from 'legacy/constants/tokens'
+import { USDC } from 'legacy/constants/tokens'
 import { useGetGpPriceStrategy } from 'legacy/hooks/useGetGpPriceStrategy'
 import { stringToCurrency } from 'legacy/state/swap/extension'
 import { useGetGpUsdcPrice } from 'legacy/utils/price'
@@ -23,7 +23,6 @@ import tryParseCurrencyAmount from 'lib/utils/tryParseCurrencyAmount'
 export const getUsdQuoteValidTo = () => Math.ceil(Date.now() / 1000) + 600
 
 const STABLECOIN_AMOUNT_OUT: { [chain in SupportedChainId]: CurrencyAmount<Token> } = {
-  [SupportedChainId.MAINNET]: CurrencyAmount.fromRawAmount(USDC_MAINNET, 100_000e6),
   [SupportedChainId.MAINNET]: CurrencyAmount.fromRawAmount(USDC[SupportedChainId.MAINNET], 100e6),
   [SupportedChainId.GOERLI]: CurrencyAmount.fromRawAmount(USDC[SupportedChainId.GOERLI], 100e6),
   [SupportedChainId.GNOSIS_CHAIN]: CurrencyAmount.fromRawAmount(USDC[SupportedChainId.GNOSIS_CHAIN], 10_000e6),
diff --git a/src/modules/twap/const.ts b/src/modules/twap/const.ts
index 714b4f57f8..5a908c5cad 100644
--- a/src/modules/twap/const.ts
+++ b/src/modules/twap/const.ts
@@ -1,8 +1,10 @@
 import { SupportedChainId } from '@cowprotocol/cow-sdk'
-import { Percent } from '@uniswap/sdk-core'
+import { Currency, CurrencyAmount, Percent } from '@uniswap/sdk-core'
 
 import ms from 'ms.macro'
 
+import { USDC } from 'legacy/constants/tokens'
+
 import { TwapOrderStatus } from './types'
 
 export const DEFAULT_TWAP_SLIPPAGE = new Percent(10, 100) // 10%
@@ -33,3 +35,9 @@ export const TWAP_HANDLER_ADDRESS: Record<SupportedChainId, string> = {
 }
 
 export const TWAP_PENDING_STATUSES = [TwapOrderStatus.WaitSigning, TwapOrderStatus.Pending, TwapOrderStatus.Scheduled]
+
+export const MINIMUM_PART_SELL_AMOUNT_FIAT: Record<SupportedChainId, CurrencyAmount<Currency>> = {
+  [SupportedChainId.MAINNET]: CurrencyAmount.fromRawAmount(USDC[SupportedChainId.MAINNET], 5_000e6), // 5k
+  [SupportedChainId.GOERLI]: CurrencyAmount.fromRawAmount(USDC[SupportedChainId.GOERLI], 100e6), // 100
+  [SupportedChainId.GNOSIS_CHAIN]: CurrencyAmount.fromRawAmount(USDC[SupportedChainId.GNOSIS_CHAIN], 5e6), // 5
+}
diff --git a/src/modules/twap/containers/TwapFormWarnings/index.tsx b/src/modules/twap/containers/TwapFormWarnings/index.tsx
index c8ca085add..e0aa8047b4 100644
--- a/src/modules/twap/containers/TwapFormWarnings/index.tsx
+++ b/src/modules/twap/containers/TwapFormWarnings/index.tsx
@@ -2,10 +2,9 @@ import { useAtomValue } from 'jotai'
 import { useUpdateAtom } from 'jotai/utils'
 import { useCallback } from 'react'
 
-import { FallbackHandlerWarning } from './warnings/FallbackHandlerWarning'
-import { UnsupportedWalletWarning } from './warnings/UnsupportedWalletWarning'
+import { FallbackHandlerWarning, SmallPartVolumeWarning, UnsupportedWalletWarning } from './warnings'
 
-import { useIsSafeViaWc } from '../../../wallet'
+import { useIsSafeViaWc, useWalletInfo } from '../../../wallet'
 import { NEED_FALLBACK_HANDLER_STATES, TwapFormState } from '../../pure/PrimaryActionButton/getTwapFormState'
 import { twapOrdersSettingsAtom, updateTwapOrdersSettingsAtom } from '../../state/twapOrdersSettingsAtom'
 
@@ -18,6 +17,7 @@ export function TwapFormWarnings({ localFormValidation, walletIsNotConnected }:
   const { isFallbackHandlerSetupAccepted } = useAtomValue(twapOrdersSettingsAtom)
   const updateTwapOrdersSettings = useUpdateAtom(updateTwapOrdersSettingsAtom)
   const isSafeViaWc = useIsSafeViaWc()
+  const { chainId } = useWalletInfo()
 
   const toggleFallbackHandlerSetupFlag = useCallback(
     (isFallbackHandlerSetupAccepted: boolean) => {
@@ -42,5 +42,9 @@ export function TwapFormWarnings({ localFormValidation, walletIsNotConnected }:
     )
   }
 
+  if (chainId && localFormValidation === TwapFormState.SELL_AMOUNT_TOO_SMALL) {
+    return <SmallPartVolumeWarning chainId={chainId} />
+  }
+
   return null
 }
diff --git a/src/modules/twap/containers/TwapFormWarnings/warnings/SmallPartVolumeWarning.tsx b/src/modules/twap/containers/TwapFormWarnings/warnings/SmallPartVolumeWarning.tsx
new file mode 100644
index 0000000000..8c9b900233
--- /dev/null
+++ b/src/modules/twap/containers/TwapFormWarnings/warnings/SmallPartVolumeWarning.tsx
@@ -0,0 +1,26 @@
+import { SupportedChainId } from '@cowprotocol/cow-sdk'
+
+import { InlineBanner } from 'common/pure/InlineBanner'
+import { TokenAmount } from 'common/pure/TokenAmount'
+
+import { MINIMUM_PART_SELL_AMOUNT_FIAT } from '../../../const'
+
+export type SmallPartVolumeWarningBannerProps = {
+  chainId: SupportedChainId
+}
+
+export function SmallPartVolumeWarning({ chainId }: SmallPartVolumeWarningBannerProps) {
+  const amount = MINIMUM_PART_SELL_AMOUNT_FIAT[chainId]
+
+  return (
+    <InlineBanner>
+      <>
+        <strong>Minimum sell size:</strong> The sell amount per part of your TWAP order should be at least{' '}
+        <strong>
+          $<TokenAmount amount={amount} hideTokenSymbol />
+        </strong>
+        . Decrease the number of parts or increase the total sell amount.
+      </>
+    </InlineBanner>
+  )
+}
diff --git a/src/modules/twap/containers/TwapFormWarnings/warnings/index.ts b/src/modules/twap/containers/TwapFormWarnings/warnings/index.ts
new file mode 100644
index 0000000000..d45eae3692
--- /dev/null
+++ b/src/modules/twap/containers/TwapFormWarnings/warnings/index.ts
@@ -0,0 +1,3 @@
+export { FallbackHandlerWarning } from './FallbackHandlerWarning'
+export { SmallPartVolumeWarning } from './SmallPartVolumeWarning'
+export { UnsupportedWalletWarning } from './UnsupportedWalletWarning'
diff --git a/src/modules/twap/hooks/useTwapFormState.ts b/src/modules/twap/hooks/useTwapFormState.ts
index a03df6b3ae..a22ddc5ba8 100644
--- a/src/modules/twap/hooks/useTwapFormState.ts
+++ b/src/modules/twap/hooks/useTwapFormState.ts
@@ -3,11 +3,13 @@ import { useMemo } from 'react'
 
 import { useAsyncMemo } from 'use-async-memo'
 
+import { useIsSafeApp, useWalletInfo } from 'modules/wallet'
+
 import { useExtensibleFallbackContext } from './useExtensibleFallbackContext'
 
-import { useIsSafeApp } from '../../wallet'
 import { getTwapFormState, TwapFormState } from '../pure/PrimaryActionButton/getTwapFormState'
 import { verifyExtensibleFallback } from '../services/verifyExtensibleFallback'
+import { partsStateAtom } from '../state/partsStateAtom'
 import { twapOrderAtom } from '../state/twapOrderAtom'
 import { twapOrdersSettingsAtom } from '../state/twapOrdersSettingsAtom'
 
@@ -15,7 +17,10 @@ export function useTwapFormState(): TwapFormState | null {
   const isSafeApp = useIsSafeApp()
   const extensibleFallbackContext = useExtensibleFallbackContext()
   const { isFallbackHandlerSetupAccepted } = useAtomValue(twapOrdersSettingsAtom)
+  const { chainId } = useWalletInfo()
+
   const twapOrder = useAtomValue(twapOrderAtom)
+  const { inputFiatAmount: sellAmountPartFiat } = useAtomValue(partsStateAtom)
 
   const verification = useAsyncMemo(
     () => (extensibleFallbackContext ? verifyExtensibleFallback(extensibleFallbackContext) : null),
@@ -24,6 +29,13 @@ export function useTwapFormState(): TwapFormState | null {
   )
 
   return useMemo(() => {
-    return getTwapFormState({ isSafeApp, isFallbackHandlerSetupAccepted, verification, twapOrder })
-  }, [isSafeApp, isFallbackHandlerSetupAccepted, verification, twapOrder])
+    return getTwapFormState({
+      isSafeApp,
+      isFallbackHandlerSetupAccepted,
+      verification,
+      twapOrder,
+      sellAmountPartFiat,
+      chainId,
+    })
+  }, [isSafeApp, isFallbackHandlerSetupAccepted, verification, twapOrder, sellAmountPartFiat, chainId])
 }
diff --git a/src/modules/twap/pure/PrimaryActionButton/getTwapFormState.tsx b/src/modules/twap/pure/PrimaryActionButton/getTwapFormState.tsx
index c7954723c2..e25ddbd72f 100644
--- a/src/modules/twap/pure/PrimaryActionButton/getTwapFormState.tsx
+++ b/src/modules/twap/pure/PrimaryActionButton/getTwapFormState.tsx
@@ -1,11 +1,19 @@
+import { SupportedChainId } from '@cowprotocol/cow-sdk'
+import { Currency, CurrencyAmount } from '@uniswap/sdk-core'
+
+import { Nullish } from 'types'
+
 import { ExtensibleFallbackVerification } from '../../services/verifyExtensibleFallback'
 import { TWAPOrder } from '../../types'
+import { isSellAmountTooSmall } from '../../utils/isSellAmountTooSmall'
 
 export interface TwapFormStateParams {
   isSafeApp: boolean
   isFallbackHandlerSetupAccepted: boolean
   verification: ExtensibleFallbackVerification | null
   twapOrder: TWAPOrder | null
+  sellAmountPartFiat: Nullish<CurrencyAmount<Currency>>
+  chainId: SupportedChainId | undefined
 }
 
 export enum TwapFormState {
@@ -13,6 +21,7 @@ export enum TwapFormState {
   NOT_SAFE = 'NOT_SAFE',
   NEED_FALLBACK_HANDLER = 'NEED_FALLBACK_HANDLER',
   ACCEPTED_FALLBACK_HANDLER_SETUP = 'ACCEPTED_FALLBACK_HANDLER_SETUP',
+  SELL_AMOUNT_TOO_SMALL = 'SELL_AMOUNT_TOO_SMALL',
 }
 
 export const NEED_FALLBACK_HANDLER_STATES = [
@@ -21,7 +30,7 @@ export const NEED_FALLBACK_HANDLER_STATES = [
 ]
 
 export function getTwapFormState(props: TwapFormStateParams): TwapFormState | null {
-  const { twapOrder, isSafeApp, isFallbackHandlerSetupAccepted, verification } = props
+  const { twapOrder, isSafeApp, isFallbackHandlerSetupAccepted, verification, sellAmountPartFiat, chainId } = props
 
   if (!isSafeApp) return TwapFormState.NOT_SAFE
 
@@ -35,5 +44,9 @@ export function getTwapFormState(props: TwapFormStateParams): TwapFormState | nu
     return TwapFormState.NEED_FALLBACK_HANDLER
   }
 
+  if (isSellAmountTooSmall(sellAmountPartFiat, chainId)) {
+    return TwapFormState.SELL_AMOUNT_TOO_SMALL
+  }
+
   return null
 }
diff --git a/src/modules/twap/pure/PrimaryActionButton/index.tsx b/src/modules/twap/pure/PrimaryActionButton/index.tsx
index 7e08c6dd9a..00b6e9ae8e 100644
--- a/src/modules/twap/pure/PrimaryActionButton/index.tsx
+++ b/src/modules/twap/pure/PrimaryActionButton/index.tsx
@@ -30,6 +30,11 @@ const buttonsMap: Record<TwapFormState, (context: PrimaryActionButtonContext) =>
       Review TWAP order
     </ButtonPrimary>
   ),
+  [TwapFormState.SELL_AMOUNT_TOO_SMALL]: () => (
+    <ButtonPrimary disabled={true} buttonSize={ButtonSize.BIG}>
+      Sell amount too small
+    </ButtonPrimary>
+  ),
 }
 
 export interface PrimaryActionButtonProps {
diff --git a/src/modules/twap/utils/isSellAmountTooSmall.ts b/src/modules/twap/utils/isSellAmountTooSmall.ts
new file mode 100644
index 0000000000..d4a3f6324d
--- /dev/null
+++ b/src/modules/twap/utils/isSellAmountTooSmall.ts
@@ -0,0 +1,19 @@
+import { SupportedChainId } from '@cowprotocol/cow-sdk'
+import { Currency, CurrencyAmount } from '@uniswap/sdk-core'
+
+import { Nullish } from 'types'
+
+import { MINIMUM_PART_SELL_AMOUNT_FIAT } from '../const'
+
+export function isSellAmountTooSmall(
+  sellAmount: Nullish<CurrencyAmount<Currency>>,
+  chainId: SupportedChainId | undefined
+): boolean {
+  if (!chainId) {
+    return false
+  }
+
+  const minimum = MINIMUM_PART_SELL_AMOUNT_FIAT[chainId]
+
+  return !!minimum && !!sellAmount && sellAmount.lessThan(minimum)
+}

From 67b1f43ffbea957ccc242fa9432c8efddccb7ab8 Mon Sep 17 00:00:00 2001
From: Leandro <alfetopito@users.noreply.github.com>
Date: Thu, 15 Jun 2023 08:57:56 -0700
Subject: [PATCH 24/67] feat(twap): validation and warnings - minimum part time
 (#2680)

* feat: add part time interval logic

* feat: add SmallPartTimeWarning banner
---
 src/modules/twap/const.ts                       |  2 ++
 .../twap/containers/TwapFormWarnings/index.tsx  | 11 ++++++++++-
 .../warnings/SmallPartTimeWarning.tsx           | 17 +++++++++++++++++
 .../TwapFormWarnings/warnings/index.ts          |  1 +
 src/modules/twap/hooks/useTwapFormState.ts      |  6 ++++--
 .../PrimaryActionButton/getTwapFormState.tsx    | 11 ++++++++++-
 .../twap/pure/PrimaryActionButton/index.tsx     |  5 +++++
 .../twap/utils/isPartTimeIntervalTooShort.ts    |  5 +++++
 8 files changed, 54 insertions(+), 4 deletions(-)
 create mode 100644 src/modules/twap/containers/TwapFormWarnings/warnings/SmallPartTimeWarning.tsx
 create mode 100644 src/modules/twap/utils/isPartTimeIntervalTooShort.ts

diff --git a/src/modules/twap/const.ts b/src/modules/twap/const.ts
index 5a908c5cad..a46ac986cd 100644
--- a/src/modules/twap/const.ts
+++ b/src/modules/twap/const.ts
@@ -41,3 +41,5 @@ export const MINIMUM_PART_SELL_AMOUNT_FIAT: Record<SupportedChainId, CurrencyAmo
   [SupportedChainId.GOERLI]: CurrencyAmount.fromRawAmount(USDC[SupportedChainId.GOERLI], 100e6), // 100
   [SupportedChainId.GNOSIS_CHAIN]: CurrencyAmount.fromRawAmount(USDC[SupportedChainId.GNOSIS_CHAIN], 5e6), // 5
 }
+
+export const MINIMUM_PART_TIME = ms`5min` / 1000 // in seconds
diff --git a/src/modules/twap/containers/TwapFormWarnings/index.tsx b/src/modules/twap/containers/TwapFormWarnings/index.tsx
index e0aa8047b4..f6d347659d 100644
--- a/src/modules/twap/containers/TwapFormWarnings/index.tsx
+++ b/src/modules/twap/containers/TwapFormWarnings/index.tsx
@@ -2,7 +2,12 @@ import { useAtomValue } from 'jotai'
 import { useUpdateAtom } from 'jotai/utils'
 import { useCallback } from 'react'
 
-import { FallbackHandlerWarning, SmallPartVolumeWarning, UnsupportedWalletWarning } from './warnings'
+import {
+  FallbackHandlerWarning,
+  SmallPartTimeWarning,
+  SmallPartVolumeWarning,
+  UnsupportedWalletWarning,
+} from './warnings'
 
 import { useIsSafeViaWc, useWalletInfo } from '../../../wallet'
 import { NEED_FALLBACK_HANDLER_STATES, TwapFormState } from '../../pure/PrimaryActionButton/getTwapFormState'
@@ -46,5 +51,9 @@ export function TwapFormWarnings({ localFormValidation, walletIsNotConnected }:
     return <SmallPartVolumeWarning chainId={chainId} />
   }
 
+  if (localFormValidation === TwapFormState.PART_TIME_INTERVAL_TOO_SHORT) {
+    return <SmallPartTimeWarning />
+  }
+
   return null
 }
diff --git a/src/modules/twap/containers/TwapFormWarnings/warnings/SmallPartTimeWarning.tsx b/src/modules/twap/containers/TwapFormWarnings/warnings/SmallPartTimeWarning.tsx
new file mode 100644
index 0000000000..3196bee934
--- /dev/null
+++ b/src/modules/twap/containers/TwapFormWarnings/warnings/SmallPartTimeWarning.tsx
@@ -0,0 +1,17 @@
+import { InlineBanner } from 'common/pure/InlineBanner'
+
+import { MINIMUM_PART_TIME } from '../../../const'
+import { deadlinePartsDisplay } from '../../../utils/deadlinePartsDisplay'
+
+export function SmallPartTimeWarning() {
+  const time = deadlinePartsDisplay(MINIMUM_PART_TIME, true)
+
+  return (
+    <InlineBanner>
+      <>
+        <strong>Minimum part time:</strong> A minimum of <strong>{time}</strong> between parts is required. Decrease the
+        number of parts or increase the total duration.
+      </>
+    </InlineBanner>
+  )
+}
diff --git a/src/modules/twap/containers/TwapFormWarnings/warnings/index.ts b/src/modules/twap/containers/TwapFormWarnings/warnings/index.ts
index d45eae3692..ad16230bf0 100644
--- a/src/modules/twap/containers/TwapFormWarnings/warnings/index.ts
+++ b/src/modules/twap/containers/TwapFormWarnings/warnings/index.ts
@@ -1,3 +1,4 @@
 export { FallbackHandlerWarning } from './FallbackHandlerWarning'
+export { SmallPartTimeWarning } from './SmallPartTimeWarning'
 export { SmallPartVolumeWarning } from './SmallPartVolumeWarning'
 export { UnsupportedWalletWarning } from './UnsupportedWalletWarning'
diff --git a/src/modules/twap/hooks/useTwapFormState.ts b/src/modules/twap/hooks/useTwapFormState.ts
index a22ddc5ba8..24a1633d30 100644
--- a/src/modules/twap/hooks/useTwapFormState.ts
+++ b/src/modules/twap/hooks/useTwapFormState.ts
@@ -10,7 +10,7 @@ import { useExtensibleFallbackContext } from './useExtensibleFallbackContext'
 import { getTwapFormState, TwapFormState } from '../pure/PrimaryActionButton/getTwapFormState'
 import { verifyExtensibleFallback } from '../services/verifyExtensibleFallback'
 import { partsStateAtom } from '../state/partsStateAtom'
-import { twapOrderAtom } from '../state/twapOrderAtom'
+import { twapOrderAtom, twapTimeIntervalAtom } from '../state/twapOrderAtom'
 import { twapOrdersSettingsAtom } from '../state/twapOrdersSettingsAtom'
 
 export function useTwapFormState(): TwapFormState | null {
@@ -21,6 +21,7 @@ export function useTwapFormState(): TwapFormState | null {
 
   const twapOrder = useAtomValue(twapOrderAtom)
   const { inputFiatAmount: sellAmountPartFiat } = useAtomValue(partsStateAtom)
+  const partTime = useAtomValue(twapTimeIntervalAtom)
 
   const verification = useAsyncMemo(
     () => (extensibleFallbackContext ? verifyExtensibleFallback(extensibleFallbackContext) : null),
@@ -36,6 +37,7 @@ export function useTwapFormState(): TwapFormState | null {
       twapOrder,
       sellAmountPartFiat,
       chainId,
+      partTime,
     })
-  }, [isSafeApp, isFallbackHandlerSetupAccepted, verification, twapOrder, sellAmountPartFiat, chainId])
+  }, [isSafeApp, isFallbackHandlerSetupAccepted, verification, twapOrder, sellAmountPartFiat, chainId, partTime])
 }
diff --git a/src/modules/twap/pure/PrimaryActionButton/getTwapFormState.tsx b/src/modules/twap/pure/PrimaryActionButton/getTwapFormState.tsx
index e25ddbd72f..9b08c8ee3e 100644
--- a/src/modules/twap/pure/PrimaryActionButton/getTwapFormState.tsx
+++ b/src/modules/twap/pure/PrimaryActionButton/getTwapFormState.tsx
@@ -5,6 +5,7 @@ import { Nullish } from 'types'
 
 import { ExtensibleFallbackVerification } from '../../services/verifyExtensibleFallback'
 import { TWAPOrder } from '../../types'
+import { isPartTimeIntervalTooShort } from '../../utils/isPartTimeIntervalTooShort'
 import { isSellAmountTooSmall } from '../../utils/isSellAmountTooSmall'
 
 export interface TwapFormStateParams {
@@ -14,6 +15,7 @@ export interface TwapFormStateParams {
   twapOrder: TWAPOrder | null
   sellAmountPartFiat: Nullish<CurrencyAmount<Currency>>
   chainId: SupportedChainId | undefined
+  partTime: number | undefined
 }
 
 export enum TwapFormState {
@@ -22,6 +24,7 @@ export enum TwapFormState {
   NEED_FALLBACK_HANDLER = 'NEED_FALLBACK_HANDLER',
   ACCEPTED_FALLBACK_HANDLER_SETUP = 'ACCEPTED_FALLBACK_HANDLER_SETUP',
   SELL_AMOUNT_TOO_SMALL = 'SELL_AMOUNT_TOO_SMALL',
+  PART_TIME_INTERVAL_TOO_SHORT = 'PART_TIME_INTERVAL_TOO_SHORT',
 }
 
 export const NEED_FALLBACK_HANDLER_STATES = [
@@ -30,7 +33,8 @@ export const NEED_FALLBACK_HANDLER_STATES = [
 ]
 
 export function getTwapFormState(props: TwapFormStateParams): TwapFormState | null {
-  const { twapOrder, isSafeApp, isFallbackHandlerSetupAccepted, verification, sellAmountPartFiat, chainId } = props
+  const { twapOrder, isSafeApp, isFallbackHandlerSetupAccepted, verification, sellAmountPartFiat, chainId, partTime } =
+    props
 
   if (!isSafeApp) return TwapFormState.NOT_SAFE
 
@@ -48,5 +52,10 @@ export function getTwapFormState(props: TwapFormStateParams): TwapFormState | nu
     return TwapFormState.SELL_AMOUNT_TOO_SMALL
   }
 
+  // Not using `twapOrder.timeInterval` because it's not filled until the order is ready
+  if (isPartTimeIntervalTooShort(partTime)) {
+    return TwapFormState.PART_TIME_INTERVAL_TOO_SHORT
+  }
+
   return null
 }
diff --git a/src/modules/twap/pure/PrimaryActionButton/index.tsx b/src/modules/twap/pure/PrimaryActionButton/index.tsx
index 00b6e9ae8e..7d61ce99cb 100644
--- a/src/modules/twap/pure/PrimaryActionButton/index.tsx
+++ b/src/modules/twap/pure/PrimaryActionButton/index.tsx
@@ -35,6 +35,11 @@ const buttonsMap: Record<TwapFormState, (context: PrimaryActionButtonContext) =>
       Sell amount too small
     </ButtonPrimary>
   ),
+  [TwapFormState.PART_TIME_INTERVAL_TOO_SHORT]: () => (
+    <ButtonPrimary disabled={true} buttonSize={ButtonSize.BIG}>
+      Interval time too short
+    </ButtonPrimary>
+  ),
 }
 
 export interface PrimaryActionButtonProps {
diff --git a/src/modules/twap/utils/isPartTimeIntervalTooShort.ts b/src/modules/twap/utils/isPartTimeIntervalTooShort.ts
new file mode 100644
index 0000000000..87669bd515
--- /dev/null
+++ b/src/modules/twap/utils/isPartTimeIntervalTooShort.ts
@@ -0,0 +1,5 @@
+import { MINIMUM_PART_TIME } from '../const'
+
+export function isPartTimeIntervalTooShort(partTime: number | undefined): boolean {
+  return partTime !== undefined && partTime < MINIMUM_PART_TIME
+}

From 7415cb65f54cd6586857e6c4973fd48681aa0e9e Mon Sep 17 00:00:00 2001
From: Nenad Vracar <34926005+nenadV91@users.noreply.github.com>
Date: Fri, 16 Jun 2023 10:24:10 +0200
Subject: [PATCH 25/67] fix: unsupported chain app crash (#2676)

---
 src/lib/hooks/useNativeCurrency.ts             | 5 ++++-
 src/modules/trade/hooks/useIsNativeInOrOut.ts  | 5 +++++
 src/modules/trade/hooks/useIsWrappedInOrOut.ts | 5 +++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/lib/hooks/useNativeCurrency.ts b/src/lib/hooks/useNativeCurrency.ts
index d879317d3c..9779be7776 100644
--- a/src/lib/hooks/useNativeCurrency.ts
+++ b/src/lib/hooks/useNativeCurrency.ts
@@ -4,13 +4,16 @@ import { SupportedChainId } from '@cowprotocol/cow-sdk'
 import { NativeCurrency } from '@uniswap/sdk-core'
 
 import { nativeOnChain } from 'legacy/constants/tokens'
+import { supportedChainId } from 'legacy/utils/supportedChainId'
 
 import { useWalletInfo } from 'modules/wallet'
 
 export const MAINNET_NATIVE_CURRENCY = nativeOnChain(SupportedChainId.MAINNET)
 
 export default function useNativeCurrency(): NativeCurrency {
-  const { chainId } = useWalletInfo()
+  const { chainId: _chainId } = useWalletInfo()
+  const chainId = supportedChainId(_chainId)
+
   return useMemo(
     () =>
       chainId
diff --git a/src/modules/trade/hooks/useIsNativeInOrOut.ts b/src/modules/trade/hooks/useIsNativeInOrOut.ts
index d9dff25ae3..c54bcebc69 100644
--- a/src/modules/trade/hooks/useIsNativeInOrOut.ts
+++ b/src/modules/trade/hooks/useIsNativeInOrOut.ts
@@ -3,6 +3,7 @@ import { useMemo } from 'react'
 import { SupportedChainId } from '@cowprotocol/cow-sdk'
 
 import { NATIVE_CURRENCY_BUY_TOKEN } from 'legacy/constants'
+import { supportedChainId } from 'legacy/utils/supportedChainId'
 
 import { useWalletInfo } from 'modules/wallet'
 
@@ -13,6 +14,10 @@ import { useTradeState } from './useTradeState'
 function getIsNativeToken(chainId: SupportedChainId, tokenId: string): boolean {
   const nativeToken = NATIVE_CURRENCY_BUY_TOKEN[chainId]
 
+  if (!supportedChainId(chainId)) {
+    return false
+  }
+
   return doesTokenMatchSymbolOrAddress(nativeToken, tokenId)
 }
 
diff --git a/src/modules/trade/hooks/useIsWrappedInOrOut.ts b/src/modules/trade/hooks/useIsWrappedInOrOut.ts
index ce62913a0c..6e23ba8cfa 100644
--- a/src/modules/trade/hooks/useIsWrappedInOrOut.ts
+++ b/src/modules/trade/hooks/useIsWrappedInOrOut.ts
@@ -3,6 +3,7 @@ import { useMemo } from 'react'
 import { SupportedChainId } from '@cowprotocol/cow-sdk'
 
 import { WRAPPED_NATIVE_CURRENCY } from 'legacy/constants/tokens'
+import { supportedChainId } from 'legacy/utils/supportedChainId'
 
 import { useWalletInfo } from 'modules/wallet'
 
@@ -13,6 +14,10 @@ import { useTradeState } from './useTradeState'
 function getIsWrappedNativeToken(chainId: SupportedChainId, tokenId: string): boolean {
   const nativeToken = WRAPPED_NATIVE_CURRENCY[chainId]
 
+  if (!supportedChainId(chainId)) {
+    return false
+  }
+
   return doesTokenMatchSymbolOrAddress(nativeToken, tokenId)
 }
 

From e32c84ffe6e246f52633abf1c22ab811c50f1f15 Mon Sep 17 00:00:00 2001
From: Nenad Vracar <34926005+nenadV91@users.noreply.github.com>
Date: Fri, 16 Jun 2023 13:14:37 +0200
Subject: [PATCH 26/67] Feature/twap analytics (#2668)

* feat: add twap flow analytics

* feat: change SWAP with TRADE and add some events

* fix: small word update

* feat: rename swap to trade

* feat: add TWAP order type

* fix: separate event for placing advanced order

* fix: error event for TWAP
---
 .../components/analytics/events/swapEvents.ts |  8 ++---
 .../analytics/events/transactionEvents.ts     | 31 ++++++++++++-------
 src/legacy/components/analytics/types.ts      |  6 +++-
 src/legacy/state/swap/hooks.tsx               |  3 +-
 .../hooks/useAdvancedOrdersActions.ts         |  2 ++
 .../hooks/useLimitOrdersWidgetActions.ts      |  3 ++
 .../limitOrders/services/tradeFlow/index.ts   |  2 +-
 src/modules/swap/services/ethFlow/index.ts    |  2 +-
 src/modules/swap/services/swapFlow/index.ts   |  2 +-
 .../trade/hooks/useSwitchTokensPlaces.ts      |  3 ++
 src/modules/trade/utils/analytics.ts          | 25 ++++++++-------
 src/modules/twap/hooks/useCreateTwapOrder.ts  | 13 ++++++++
 12 files changed, 68 insertions(+), 32 deletions(-)

diff --git a/src/legacy/components/analytics/events/swapEvents.ts b/src/legacy/components/analytics/events/swapEvents.ts
index 54f3a49427..ce403b32e1 100644
--- a/src/legacy/components/analytics/events/swapEvents.ts
+++ b/src/legacy/components/analytics/events/swapEvents.ts
@@ -14,14 +14,14 @@ export function currencySelectAnalytics(field: Field, label: string | undefined)
 
 export function setMaxSellTokensAnalytics() {
   sendEvent({
-    category: Category.SWAP,
+    category: Category.TRADE,
     action: 'Set Maximun Sell Tokens',
   })
 }
 
 function _changeSwapAmountAnalytics(field: Field, value: number) {
   sendEvent({
-    category: Category.SWAP,
+    category: Category.TRADE,
     action: `Change ${field} field amount`,
     value,
   })
@@ -33,14 +33,14 @@ export const changeSwapAmountAnalytics = debounce(([field, value]: [Field, numbe
 
 export function switchTokensAnalytics() {
   sendEvent({
-    category: Category.SWAP,
+    category: Category.TRADE,
     action: 'Switch INPUT/OUTPUT tokens',
   })
 }
 
 export function initialPriceLoadAnalytics() {
   sendEvent({
-    category: Category.SWAP,
+    category: Category.TRADE,
     action: 'Initial Price estimation',
   })
 }
diff --git a/src/legacy/components/analytics/events/transactionEvents.ts b/src/legacy/components/analytics/events/transactionEvents.ts
index 6be62a94b2..2e0415f397 100644
--- a/src/legacy/components/analytics/events/transactionEvents.ts
+++ b/src/legacy/components/analytics/events/transactionEvents.ts
@@ -8,15 +8,16 @@ import { sendMicrosoftEvent } from '../pixel/microsoft'
 import { sendPavedEvent } from '../pixel/paved'
 import { sendRedditEvent } from '../pixel/reddit'
 import { sendTwitterEvent } from '../pixel/twitter'
-import { Category } from '../types'
+import { AnalyticsOrderType, Category } from '../types'
 
-const LABEL_FROM_CLASS: Record<OrderClass, string> = {
+const LABEL_FROM_CLASS: Record<AnalyticsOrderType, string> = {
   [OrderClass.LIMIT]: 'Limit Order',
   [OrderClass.MARKET]: 'Market Order',
   [OrderClass.LIQUIDITY]: 'Liquidity Order',
+  TWAP: 'TWAP Order',
 }
 
-function getClassLabel(orderClass: OrderClass, label?: string) {
+function getClassLabel(orderClass: AnalyticsOrderType, label?: string) {
   const classLabel = LABEL_FROM_CLASS[orderClass]
   return label ? `${label}::${classLabel}` : classLabel
 }
@@ -51,33 +52,39 @@ export function claimAnalytics(action: ClaimAction, value?: number) {
 type ApprovalAction = 'Send' | 'Sign' | 'Reject' | 'Error'
 export function approvalAnalytics(action: ApprovalAction, label?: string, value?: number) {
   sendEvent({
-    category: Category.SWAP,
+    category: Category.TRADE,
     action: `${action} Token Approval`,
     label,
     value,
   })
 }
 
-export type SwapAction = 'Send' | 'Error' | 'Reject' | 'Bundle Approve and Swap' | 'Bundled Eth Flow'
-export function swapAnalytics(action: SwapAction, orderClass: OrderClass, label?: string, value?: number) {
+export type TradeAction =
+  | 'Send'
+  | 'Error'
+  | 'Reject'
+  | 'Bundle Approve and Swap'
+  | 'Bundled Eth Flow'
+  | 'Place Advanced Order'
+export function tradeAnalytics(action: TradeAction, orderClass: AnalyticsOrderType, label?: string, value?: number) {
   sendEvent({
-    category: Category.SWAP,
+    category: Category.TRADE,
     action,
     label: getClassLabel(orderClass, label),
     value,
   })
 }
 
-export function signSwapAnalytics(orderClass: OrderClass, label?: string) {
+export function signTradeAnalytics(orderClass: AnalyticsOrderType, label?: string) {
   sendEvent({
-    category: Category.SWAP,
+    category: Category.TRADE,
     action: 'Sign',
     label: getClassLabel(orderClass, label),
   })
 }
 
 export type OrderType = 'Posted' | 'Executed' | 'Canceled' | 'Expired'
-export function orderAnalytics(action: OrderType, orderClass: OrderClass, label?: string) {
+export function orderAnalytics(action: OrderType, orderClass: AnalyticsOrderType, label?: string) {
   if (action === 'Posted') {
     sendFacebookEvent(PIXEL_EVENTS.POST_TRADE)
     sendLinkedinEvent(PIXEL_EVENTS.POST_TRADE)
@@ -88,7 +95,7 @@ export function orderAnalytics(action: OrderType, orderClass: OrderClass, label?
   }
 
   sendEvent({
-    category: Category.SWAP,
+    category: Category.TRADE,
     action,
     label: getClassLabel(orderClass, label),
   })
@@ -96,7 +103,7 @@ export function orderAnalytics(action: OrderType, orderClass: OrderClass, label?
 
 export function priceOutOfRangeAnalytics(isUnfillable: boolean, label: string) {
   sendEvent({
-    category: Category.SWAP,
+    category: Category.TRADE,
     action: `Order price is ${isUnfillable ? 'out of' : 'back to'} market`,
     label,
   })
diff --git a/src/legacy/components/analytics/types.ts b/src/legacy/components/analytics/types.ts
index 3cf365d447..9c6735b855 100644
--- a/src/legacy/components/analytics/types.ts
+++ b/src/legacy/components/analytics/types.ts
@@ -1,5 +1,7 @@
+import { OrderClass } from '@cowprotocol/cow-sdk'
+
 export enum Category {
-  SWAP = 'Swap',
+  TRADE = 'Trade',
   LIST = 'Lists',
   CURRENCY_SELECT = 'Currency Select',
   EXPERT_MODE = 'Expert mode',
@@ -29,3 +31,5 @@ export enum Dimensions {
   customBrowserType = 'customBrowserType',
   userAddress = 'userAddress',
 }
+
+export type AnalyticsOrderType = OrderClass | 'TWAP'
diff --git a/src/legacy/state/swap/hooks.tsx b/src/legacy/state/swap/hooks.tsx
index 09691cd1f2..db27472ee4 100644
--- a/src/legacy/state/swap/hooks.tsx
+++ b/src/legacy/state/swap/hooks.tsx
@@ -6,7 +6,7 @@ import { Currency, CurrencyAmount, Percent } from '@uniswap/sdk-core'
 import { t } from '@lingui/macro'
 import { ParsedQs } from 'qs'
 
-import { changeSwapAmountAnalytics } from 'legacy/components/analytics'
+import { changeSwapAmountAnalytics, switchTokensAnalytics } from 'legacy/components/analytics'
 import { FEE_SIZE_THRESHOLD, INITIAL_ALLOWED_SLIPPAGE_PERCENT } from 'legacy/constants'
 import { useCurrency } from 'legacy/hooks/Tokens'
 import useENS from 'legacy/hooks/useENS'
@@ -109,6 +109,7 @@ export function useSwapActionHandlers(): SwapActions {
 
     navigate(chainId, { inputCurrencyId: outputCurrencyId, outputCurrencyId: inputCurrencyId })
     dispatch(switchCurrencies())
+    switchTokensAnalytics()
   }, [swapState, navigate, chainId, dispatch])
 
   const onUserInput = useCallback(
diff --git a/src/modules/advancedOrders/hooks/useAdvancedOrdersActions.ts b/src/modules/advancedOrders/hooks/useAdvancedOrdersActions.ts
index 837a27734a..b519a5eeaa 100644
--- a/src/modules/advancedOrders/hooks/useAdvancedOrdersActions.ts
+++ b/src/modules/advancedOrders/hooks/useAdvancedOrdersActions.ts
@@ -3,6 +3,7 @@ import { useCallback } from 'react'
 
 import { Currency } from '@uniswap/sdk-core'
 
+import { changeSwapAmountAnalytics } from 'legacy/components/analytics'
 import { Field } from 'legacy/state/swap/actions'
 
 import { useNavigateOnCurrencySelection } from 'modules/trade/hooks/useNavigateOnCurrencySelection'
@@ -37,6 +38,7 @@ export function useAdvancedOrdersActions() {
 
   const onUserInput = useCallback(
     (field: Field, typedValue: string) => {
+      changeSwapAmountAnalytics(field, Number(typedValue))
       updateCurrencyAmount({
         amount: { isTyped: true, value: typedValue },
         currency: inputCurrency,
diff --git a/src/modules/limitOrders/containers/LimitOrdersWidget/hooks/useLimitOrdersWidgetActions.ts b/src/modules/limitOrders/containers/LimitOrdersWidget/hooks/useLimitOrdersWidgetActions.ts
index ee48824e23..a936614263 100644
--- a/src/modules/limitOrders/containers/LimitOrdersWidget/hooks/useLimitOrdersWidgetActions.ts
+++ b/src/modules/limitOrders/containers/LimitOrdersWidget/hooks/useLimitOrdersWidgetActions.ts
@@ -3,6 +3,7 @@ import { useCallback } from 'react'
 
 import { OrderKind } from '@cowprotocol/cow-sdk'
 
+import { changeSwapAmountAnalytics } from 'legacy/components/analytics'
 import { Field } from 'legacy/state/swap/actions'
 
 import { updateLimitOrdersRawStateAtom } from 'modules/limitOrders'
@@ -34,6 +35,8 @@ export function useLimitOrdersWidgetActions(): TradeWidgetActions {
 
       const value = tryParseCurrencyAmount(typedValue, currency) || null
 
+      changeSwapAmountAnalytics(field, Number(typedValue))
+
       updateCurrencyAmount({
         activeRate,
         amount: value,
diff --git a/src/modules/limitOrders/services/tradeFlow/index.ts b/src/modules/limitOrders/services/tradeFlow/index.ts
index 32f93752eb..720d5a671e 100644
--- a/src/modules/limitOrders/services/tradeFlow/index.ts
+++ b/src/modules/limitOrders/services/tradeFlow/index.ts
@@ -41,7 +41,7 @@ export async function tradeFlow(
   }
 
   logTradeFlow('LIMIT ORDER FLOW', 'STEP 2: send transaction')
-  tradeFlowAnalytics.swap(swapFlowAnalyticsContext)
+  tradeFlowAnalytics.trade(swapFlowAnalyticsContext)
   beforeTrade?.()
 
   const validTo = calculateLimitOrdersDeadline(settingsState)
diff --git a/src/modules/swap/services/ethFlow/index.ts b/src/modules/swap/services/ethFlow/index.ts
index 59fff32fc1..ba405d9814 100644
--- a/src/modules/swap/services/ethFlow/index.ts
+++ b/src/modules/swap/services/ethFlow/index.ts
@@ -36,7 +36,7 @@ export async function ethFlow(
 
   logTradeFlow('ETH FLOW', 'STEP 2: send transaction')
   // TODO: check if we need own eth flow analytics or more generic
-  tradeFlowAnalytics.swap(swapFlowAnalyticsContext)
+  tradeFlowAnalytics.trade(swapFlowAnalyticsContext)
   swapConfirmManager.sendTransaction(context.trade)
 
   logTradeFlow('ETH FLOW', 'STEP 3: Get Unique Order Id (prevent collisions)')
diff --git a/src/modules/swap/services/swapFlow/index.ts b/src/modules/swap/services/swapFlow/index.ts
index 4dc2a3c016..510f440d55 100644
--- a/src/modules/swap/services/swapFlow/index.ts
+++ b/src/modules/swap/services/swapFlow/index.ts
@@ -24,7 +24,7 @@ export async function swapFlow(
   }
 
   logTradeFlow('SWAP FLOW', 'STEP 2: send transaction')
-  tradeFlowAnalytics.swap(input.swapFlowAnalyticsContext)
+  tradeFlowAnalytics.trade(input.swapFlowAnalyticsContext)
   input.swapConfirmManager.sendTransaction(input.context.trade)
 
   try {
diff --git a/src/modules/trade/hooks/useSwitchTokensPlaces.ts b/src/modules/trade/hooks/useSwitchTokensPlaces.ts
index f99e14322b..0e8fc09352 100644
--- a/src/modules/trade/hooks/useSwitchTokensPlaces.ts
+++ b/src/modules/trade/hooks/useSwitchTokensPlaces.ts
@@ -1,5 +1,7 @@
 import { useCallback } from 'react'
 
+import { switchTokensAnalytics } from 'legacy/components/analytics'
+
 import { useWalletInfo } from 'modules/wallet'
 
 import { FractionUtils } from 'utils/fractionUtils'
@@ -27,6 +29,7 @@ export function useSwitchTokensPlaces(stateOverride: Partial<ExtendedTradeRawSta
     if (!inputCurrencyId || !outputCurrencyId || !updateState) return
 
     if (!isWrapOrUnwrap) {
+      switchTokensAnalytics()
       updateState({
         inputCurrencyId: outputCurrencyId,
         outputCurrencyId: inputCurrencyId,
diff --git a/src/modules/trade/utils/analytics.ts b/src/modules/trade/utils/analytics.ts
index a66a826a0d..7ebf50ffe0 100644
--- a/src/modules/trade/utils/analytics.ts
+++ b/src/modules/trade/utils/analytics.ts
@@ -1,6 +1,5 @@
-import { OrderClass } from '@cowprotocol/cow-sdk'
-
-import { signSwapAnalytics, swapAnalytics } from 'legacy/components/analytics'
+import { signTradeAnalytics, tradeAnalytics } from 'legacy/components/analytics'
+import { AnalyticsOrderType } from 'legacy/components/analytics/types'
 
 import { USER_SWAP_REJECTED_ERROR } from 'modules/trade/utils/swapErrorHelper'
 
@@ -9,32 +8,36 @@ export interface SwapFlowAnalyticsContext {
   recipient: string | null
   recipientAddress: string | null
   marketLabel?: string
-  orderClass: OrderClass
+  orderClass: AnalyticsOrderType
 }
 
 export const tradeFlowAnalytics = {
-  swap(context: SwapFlowAnalyticsContext) {
-    swapAnalytics('Send', context.orderClass, context.marketLabel)
+  trade(context: SwapFlowAnalyticsContext) {
+    tradeAnalytics('Send', context.orderClass, context.marketLabel)
   },
   sign(context: SwapFlowAnalyticsContext) {
     const { marketLabel, orderClass } = context
-    signSwapAnalytics(orderClass, marketLabel)
+    signTradeAnalytics(orderClass, marketLabel)
   },
   approveAndPresign(context: SwapFlowAnalyticsContext) {
     const { marketLabel, orderClass } = context
-    swapAnalytics('Bundle Approve and Swap', orderClass, marketLabel)
+    tradeAnalytics('Bundle Approve and Swap', orderClass, marketLabel)
+  },
+  placeAdvancedOrder(context: SwapFlowAnalyticsContext) {
+    const { marketLabel, orderClass } = context
+    tradeAnalytics('Place Advanced Order', orderClass, marketLabel)
   },
   wrapApproveAndPresign(context: SwapFlowAnalyticsContext) {
     const { marketLabel, orderClass } = context
-    swapAnalytics('Bundled Eth Flow', orderClass, marketLabel)
+    tradeAnalytics('Bundled Eth Flow', orderClass, marketLabel)
   },
   error(error: any, errorMessage: string, context: SwapFlowAnalyticsContext) {
     const { marketLabel, orderClass } = context
 
     if (errorMessage === USER_SWAP_REJECTED_ERROR) {
-      swapAnalytics('Reject', orderClass, marketLabel)
+      tradeAnalytics('Reject', orderClass, marketLabel)
     } else {
-      swapAnalytics(
+      tradeAnalytics(
         'Error',
         orderClass,
         marketLabel,
diff --git a/src/modules/twap/hooks/useCreateTwapOrder.ts b/src/modules/twap/hooks/useCreateTwapOrder.ts
index 261dbcd989..231e24bc4f 100644
--- a/src/modules/twap/hooks/useCreateTwapOrder.ts
+++ b/src/modules/twap/hooks/useCreateTwapOrder.ts
@@ -9,6 +9,8 @@ import { Nullish } from 'types'
 
 import { useAdvancedOrdersDerivedState } from 'modules/advancedOrders'
 import { useTradeConfirmActions } from 'modules/trade'
+import { SwapFlowAnalyticsContext } from 'modules/trade/utils/analytics'
+import { tradeFlowAnalytics } from 'modules/trade/utils/analytics'
 import { useWalletInfo } from 'modules/wallet'
 
 import { useExtensibleFallbackContext } from './useExtensibleFallbackContext'
@@ -55,11 +57,20 @@ export function useCreateTwapOrder() {
         outputAmount: outputCurrencyAmount,
       }
 
+      const twapFlowAnalyticsContext: SwapFlowAnalyticsContext = {
+        account,
+        recipient: twapOrder.receiver,
+        recipientAddress: twapOrder.receiver,
+        marketLabel: [inputCurrencyAmount.currency.symbol, outputCurrencyAmount.currency.symbol].join(','),
+        orderClass: 'TWAP',
+      }
+
       const startTime = Math.round((Date.now() + ms`1m`) / 1000) // Now + 1 min
       const twapOrderWithStartTime = { ...twapOrder, startTime }
       const paramsStruct = buildTwapOrderParamsStruct(chainId, twapOrderWithStartTime)
       const orderId = getConditionalOrderId(paramsStruct)
 
+      tradeFlowAnalytics.placeAdvancedOrder(twapFlowAnalyticsContext)
       tradeConfirmActions.onSign(pendingTrade)
 
       try {
@@ -79,8 +90,10 @@ export function useCreateTwapOrder() {
         })
 
         tradeConfirmActions.onSuccess(safeTxHash)
+        tradeFlowAnalytics.sign(twapFlowAnalyticsContext)
       } catch (error) {
         tradeConfirmActions.onError(error.message || error)
+        tradeFlowAnalytics.error(error, error.message, twapFlowAnalyticsContext)
       }
     },
     [

From b074d1c75fe085966eb0102b2c536588bd4d1bd9 Mon Sep 17 00:00:00 2001
From: Anxo Rodriguez <anxolin@gmail.com>
Date: Thu, 22 Jun 2023 13:56:55 +0100
Subject: [PATCH 27/67] feat: integrate with nx (#2695)

* feat: integrate with nx

* chore: improve config
---
 nx.json      |  45 +++++++
 package.json | 156 ++++++++++++++++-----
 yarn.lock    | 373 ++++++++++++++++++++++++++++++++++++++++++++++++---
 3 files changed, 523 insertions(+), 51 deletions(-)
 create mode 100644 nx.json

diff --git a/nx.json b/nx.json
new file mode 100644
index 0000000000..148b0d5bdb
--- /dev/null
+++ b/nx.json
@@ -0,0 +1,45 @@
+{
+  "namedInputs": {
+    "default": ["{projectRoot}/**/*"],
+    "production": ["!{projectRoot}/**/*.test.tsx"]
+  },
+  "targetDefaults": {
+    "build": {
+      "inputs": ["production", "^production"],
+      "dependsOn": ["^build"],
+      "outputs": ["{projectRoot}/build"]
+    },
+    "test": {
+      "inputs": ["default", "^production", "{workspaceRoot}/package.json"]
+    }
+  },
+  "tasksRunnerOptions": {
+    "default": {
+      "runner": "nx-cloud",
+      "options": {
+        "cacheableOperations": [
+          "build",
+          "build:analyze",
+          "ipfs:build",
+          "contracts:add:export",
+          "contracts:compile:abi",
+          "contracts:compile:abi-ethflow",
+          "contracts:compile:abi-uniswap",
+          "contracts:compile:v3",
+          "contracts:compile",
+          "optimize-bundle",
+          "i18n:extract",
+          "i18n:compile",
+          "i18n:pseudo",
+          "cosmos:export",
+          "sitemap",
+          "writeVersion"
+        ],
+        "accessToken": "MTEyNmY3NzgtMGUzMy00NGI1LTk4NzEtZTIzNzBiMjRjZGY3fHJlYWQtd3JpdGU="
+      }
+    }
+  },
+  "affected": {
+    "defaultBase": "develop"
+  }
+}
diff --git a/package.json b/package.json
index 48e3220821..d2dcf55054 100644
--- a/package.json
+++ b/package.json
@@ -6,44 +6,50 @@
   "author": "",
   "license": "ISC",
   "scripts": {
-    "start": "craco start",
-    "build": "yarn i18n:compile && craco build && yarn writeVersion",
-    "test": "craco test --env=jsdom",
-    "start:ssl": "HTTPS=true yarn start",
-    "start:service-worker": "yarn build && yarn serve",
-    "lint:fix": "yarn run eslint --fix ./",
-    "mock": "REACT_APP_MOCK=true yarn start",
-    "build:analyze": "cross-env REACT_APP_ANALYZE_BUNDLE=true yarn build",
-    "ipfs:build": "cross-env PUBLIC_URL=\".\" yarn build",
-    "ipfs:publish": "ipfs-deploy build -p pinata -O",
-    "test:debug": "craco --inspect-brk test --runInBand --no-cache",
+    "start": "nx exec -- craco start",
+    "build": "nx exec -- yarn _build ",
+    "test": "nx exec -- craco test --env=jsdom",
+    "start:ssl": "nx exec -- HTTPS=true yarn start",
+    "start:service-worker": "nx exec -- yarn _start:service-worker ",
+    "lint:fix": "nx exec -- yarn run eslint --fix ./",
+    "mock": "nx exec -- REACT_APP_MOCK=true yarn start",
+    "build:analyze": "nx exec -- cross-env REACT_APP_ANALYZE_BUNDLE=true yarn build",
+    "ipfs:build": "nx exec -- cross-env PUBLIC_URL=\".\" yarn build",
+    "ipfs:publish": "nx exec -- ipfs-deploy build -p pinata -O",
+    "test:debug": "nx exec -- craco --inspect-brk test --runInBand --no-cache",
     "eject": "react-scripts eject",
-    "integration-test": "start-server-and-test 'serve build -l 3000' http://localhost:3000 'cypress run'",
-    "serve": "serve build -l 3000",
-    "serve:ci": "serve website -l 3000",
-    "cypress": "cypress open",
-    "contracts:add:export": "node ./scripts/contracts_add_export.js",
-    "contracts:compile:abi": "typechain --target ethers-v5 --out-dir src/abis/types './src/abis/**/*.json'",
-    "contracts:compile:abi-ethflow": "typechain --target ethers-v5 --out-dir src/abis/types/ethflow \"./node_modules/@cowprotocol/ethflowcontract/artifacts/CoWSwapEthFlow.sol/*.json\"",
-    "contracts:compile:abi-uniswap": "typechain --target ethers-v5 --out-dir src/legacy/abis/types \"./src/legacy/abis/**/*.json\"",
-    "contracts:compile:v3": "typechain --target ethers-v5 --out-dir src/legacy/types/v3 \"./node_modules/@uniswap/**/artifacts/contracts/**/*[!dbg].json\"",
-    "contracts:compile": "yarn contracts:compile:abi && yarn contracts:compile:abi-ethflow && yarn contracts:add:export && yarn contracts:compile:abi-uniswap && yarn contracts:compile:v3",
+    "integration-test": "nx exec -- start-server-and-test 'serve build -l 3000' http://localhost:3000 'cypress run'",
+    "serve": "nx exec -- serve build -l 3000",
+    "serve:ci": "nx exec -- serve website -l 3000",
+    "cypress": "nx exec -- cypress open",
+    "contracts:add:export": "nx exec -- node ./scripts/contracts_add_export.js",
+    "contracts:compile:abi": "nx exec -- typechain --target ethers-v5 --out-dir src/abis/types './src/abis/**/*.json'",
+    "contracts:compile:abi-ethflow": "nx exec -- typechain --target ethers-v5 --out-dir src/abis/types/ethflow \"./node_modules/@cowprotocol/ethflowcontract/artifacts/CoWSwapEthFlow.sol/*.json\"",
+    "contracts:compile:abi-uniswap": "nx exec -- typechain --target ethers-v5 --out-dir src/legacy/abis/types \"./src/legacy/abis/**/*.json\"",
+    "contracts:compile:v3": "nx exec -- typechain --target ethers-v5 --out-dir src/legacy/types/v3 \"./node_modules/@uniswap/**/artifacts/contracts/**/*[!dbg].json\"",
+    "contracts:compile": "nx exec -- yarn _contracts:compile ",
     "prei18n:extract": "touch src/locales/en-US.po",
-    "optimize-bundle": "node ./scripts/fix-ethereumjs-bundle.js",
-    "patch-package": "patch-package",
-    "i18n:extract": "cross-env NODE_ENV=development lingui extract --locale en-US",
-    "i18n:compile": "yarn i18n:extract && lingui compile",
-    "i18n:pseudo": "lingui extract --locale pseudo && lingui compile",
+    "optimize-bundle": "nx exec -- node ./scripts/fix-ethereumjs-bundle.js",
+    "patch-package": "nx exec -- patch-package",
+    "i18n:extract": "nx exec -- cross-env NODE_ENV=development lingui extract --locale en-US",
+    "i18n:compile": "nx exec -- yarn _i18n:compile ",
+    "i18n:pseudo": "nx exec -- yarn _i18n:pseudo ",
     "postinstall": "yarn contracts:compile && yarn i18n:compile && yarn patch-package",
     "prepare": "husky install",
     "prepublishOnly": "yarn widgets:build",
-    "test:e2e": "start-server-and-test 'serve build -l 3000' http://localhost:3000 'cypress run --record'",
-    "cosmos:clear": "rm -rf ./public/cosmos",
-    "cosmos:run": "yarn cosmos:clear && cosmos",
-    "cosmos:export": "cross-env NODE_ENV=development cosmos-export",
-    "widgets:build": "rollup --config --failAfterWarnings --configPlugin typescript2",
-    "sitemap": "node src/sitemap",
-    "writeVersion": "node src/writeVersion"
+    "test:e2e": "nx exec -- start-server-and-test 'serve build -l 3000' http://localhost:3000 'cypress run --record'",
+    "cosmos:clear": "nx exec -- rm -rf ./public/cosmos",
+    "cosmos:run": "nx exec -- yarn _cosmos:run ",
+    "cosmos:export": "nx exec -- cross-env NODE_ENV=development cosmos-export",
+    "widgets:build": "nx exec -- rollup --config --failAfterWarnings --configPlugin typescript2",
+    "sitemap": "nx exec -- node src/sitemap",
+    "writeVersion": "nx exec -- node src/writeVersion",
+    "_build": "yarn i18n:compile && craco build && yarn writeVersion",
+    "_start:service-worker": "yarn build && yarn serve",
+    "_contracts:compile": "yarn contracts:compile:abi && yarn contracts:compile:abi-ethflow && yarn contracts:add:export && yarn contracts:compile:abi-uniswap && yarn contracts:compile:v3",
+    "_i18n:compile": "yarn i18n:extract && lingui compile",
+    "_i18n:pseudo": "lingui extract --locale pseudo && lingui compile",
+    "_cosmos:run": "yarn cosmos:clear && cosmos"
   },
   "browser": {
     "crypto": false
@@ -244,6 +250,88 @@
     "stream-http": "^3.2.0",
     "ts-mockito": "^2.6.1",
     "typechain": "^8.1.1",
-    "webpack-bundle-analyzer": "^4.7.0"
+    "webpack-bundle-analyzer": "^4.7.0",
+    "nx": "16.3.2",
+    "nx-cloud": "latest"
+  },
+  "nx": {
+    "targets": {
+      "build": {
+        "outputs": [
+          "{projectRoot}/build",
+          "{projectRoot}/src/locales"
+        ]
+      },
+      "build:analyze": {
+        "outputs": [
+          "{projectRoot}/build"
+        ]
+      },
+      "ipfs:build": {
+        "outputs": [
+          "{projectRoot}/build"
+        ]
+      },
+      "optimize-bundle": {
+        "outputs": [
+          "{projectRoot}/../node_modules/@ethereumjs/common/dist.browser/genesisStates/mainnet.json"
+        ]
+      },
+      "contracts:add:export": {
+        "outputs": [
+          "{projectRoot}/src/abis/types/index.ts"
+        ]
+      },
+      "contracts:compile:abi": {
+        "outputs": [
+          "{projectRoot}/src/abis/types"
+        ]
+      },
+      "contracts:compile:abi-ethflow": {
+        "outputs": [
+          "{projectRoot}/src/abis/types/ethflow"
+        ]
+      },
+      "contracts:compile:abi-uniswap": {
+        "outputs": [
+          "{projectRoot}/src/legacy/abis/types"
+        ]
+      },
+      "contracts:compile:v3": {
+        "outputs": [
+          "{projectRoot}/src/legacy/types/v3"
+        ]
+      },
+      "i18n:extract": {
+        "outputs": [
+          "{projectRoot}/src/locales"
+        ]
+      },
+      "i18n:compile": {
+        "outputs": [
+          "{projectRoot}/src/locales"
+        ]
+      },
+      "i18n:pseudo": {
+        "outputs": [
+          "{projectRoot}/src/locales"
+        ]
+      },
+      "cosmos:export": {
+        "outputs": [
+          "{projectRoot}/public/cosmos"
+        ]
+      },
+      "sitemap": {
+        "outputs": [
+          "{projectRoot}/public/sitemap.xml"
+        ]
+      },
+      "writeVersion": {
+        "outputs": [
+          "{projectRoot}/public/version.json"
+        ]
+      }
+    }
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 14d5ea1e9e..15e35441f6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2725,6 +2725,70 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
+"@nrwl/nx-cloud@16.0.5":
+  version "16.0.5"
+  resolved "https://registry.yarnpkg.com/@nrwl/nx-cloud/-/nx-cloud-16.0.5.tgz#c963480a71c4afa964fbbe9e4d6bbf222764e9cd"
+  integrity sha512-1p82ym8WE9ziejwgPslstn19iV/VkHfHfKr/5YOnfCHQS+NxUf92ogcYhHXtqWLblVZ9Zs4W4pkSXK4e04wCmQ==
+  dependencies:
+    nx-cloud "16.0.5"
+
+"@nrwl/tao@16.3.2":
+  version "16.3.2"
+  resolved "https://registry.yarnpkg.com/@nrwl/tao/-/tao-16.3.2.tgz#eefc1974342afbbe48e4e5351d6707ad2f9fb179"
+  integrity sha512-2Kg7dtv6JcQagCZPSq+okceI81NqmXGGgbKWqS7sOfdmp1otxS9uiUFNXw+Pdtnw38mdRviMtSOXScntu4sUKg==
+  dependencies:
+    nx "16.3.2"
+
+"@nx/nx-darwin-arm64@16.3.2":
+  version "16.3.2"
+  resolved "https://registry.yarnpkg.com/@nx/nx-darwin-arm64/-/nx-darwin-arm64-16.3.2.tgz#83b6e78b27d2d7da8f7626560f52070c8735d28a"
+  integrity sha512-YfYVNfsJBzBcBnJUU4AcA6A4QMkgnVlETfp4KGL36Otq542mRY1ISGHdox63ocI5AKh5gay5AaGcR4wR9PU9Vg==
+
+"@nx/nx-darwin-x64@16.3.2":
+  version "16.3.2"
+  resolved "https://registry.yarnpkg.com/@nx/nx-darwin-x64/-/nx-darwin-x64-16.3.2.tgz#0ae2a64356542c5fb73ca8038ce10ec4512e7fcb"
+  integrity sha512-bJtpozz0zSRVRrcQ76GrlT3TWEGTymLYWrVG51bH5KZ46t6/a4EQBI3uL3vubMmOZ0jR4ywybOcPBBhxmBJ68w==
+
+"@nx/nx-freebsd-x64@16.3.2":
+  version "16.3.2"
+  resolved "https://registry.yarnpkg.com/@nx/nx-freebsd-x64/-/nx-freebsd-x64-16.3.2.tgz#202adf4d6070f47ed46450f006ecd50851147c74"
+  integrity sha512-ZvufI0bWqT67nLbBo6ejrIGxypdoedRQTP/tudWbs/4isvxLe1uVku1BfKCTQUsJG367SqNOU1H5kzI/MRr3ow==
+
+"@nx/nx-linux-arm-gnueabihf@16.3.2":
+  version "16.3.2"
+  resolved "https://registry.yarnpkg.com/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-16.3.2.tgz#62314a82566e3647866b9dd4167a2d0e1397f001"
+  integrity sha512-IQL4kxdiZLvifar7+SIum3glRuVsxtE0dL8RvteSDXrxDQnaTUrjILC+VGhalRmk7ngBbGKNrhWOeeL7390CzQ==
+
+"@nx/nx-linux-arm64-gnu@16.3.2":
+  version "16.3.2"
+  resolved "https://registry.yarnpkg.com/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-16.3.2.tgz#02826400aa55b8f44bac83332dd29647d0e95001"
+  integrity sha512-f6AWgPVu3mfUEoOBa0rY2/7QY0Or9eR0KtLFpcPh7RUpxPw2EXzIbjD/0RGipdpspSrgiMKbZpsUjo6mXBFsQA==
+
+"@nx/nx-linux-arm64-musl@16.3.2":
+  version "16.3.2"
+  resolved "https://registry.yarnpkg.com/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-16.3.2.tgz#a0a81520e0904aa026a7ab0a8a3bf3facec9f14c"
+  integrity sha512-AvrWcYz7021E3b5P9/0i26p60XMZfw86Epks51L6AhlflarlOH4AcEChc7APMtb1ELAIbDWx2S6oIDRbQ7rtVA==
+
+"@nx/nx-linux-x64-gnu@16.3.2":
+  version "16.3.2"
+  resolved "https://registry.yarnpkg.com/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-16.3.2.tgz#e79b5c142ec8d9bfb458ea5803bc4b62abbcf296"
+  integrity sha512-K2pWGAcbCNm6b7UZI9cc8z4Rb540QcuepBXD7akjPjWerzXriT6VCn4i9mVKsCg2mwSfknTJJVJ1PZwJSmTl/Q==
+
+"@nx/nx-linux-x64-musl@16.3.2":
+  version "16.3.2"
+  resolved "https://registry.yarnpkg.com/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-16.3.2.tgz#900aee8f171638b9fb44378e2ac0548cb4aa99a7"
+  integrity sha512-sY1QDuQlqyYiRPJZanrtV07tU0DOXiCrWb0pDsGiO0qHuUSmW5Vw17GWEY4z3rt0/5U8fJ+/9WQrneviOmsOKg==
+
+"@nx/nx-win32-arm64-msvc@16.3.2":
+  version "16.3.2"
+  resolved "https://registry.yarnpkg.com/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-16.3.2.tgz#88db772b3535648e147b1a0206b1a1fe875fa9a5"
+  integrity sha512-wBfohT2hjrLKn9WFHvG0MFVk7uYhgYNiptnTLdTouziHgFyZ08vyl7XYBq55BwHPMQ5iswVoEfjn/5ZBfCPscg==
+
+"@nx/nx-win32-x64-msvc@16.3.2":
+  version "16.3.2"
+  resolved "https://registry.yarnpkg.com/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-16.3.2.tgz#2195faaf1fc465c7a89bfdd62323fdd2a5d91f15"
+  integrity sha512-QC0sWrfQm0/WdvvM//7UAgm+otbak6bznZ0zawTeqmLBh1hLjNeweyzSVKQEtZtlzDMKpzCVuuwkJq+VKBLvmw==
+
 "@openzeppelin/contracts@3.4.1-solc-0.7-2":
   version "3.4.1-solc-0.7-2"
   resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-3.4.1-solc-0.7-2.tgz#371c67ebffe50f551c3146a9eec5fe6ffe862e92"
@@ -2735,6 +2799,14 @@
   resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-3.4.2-solc-0.7.tgz#38f4dbab672631034076ccdf2f3201fab1726635"
   integrity sha512-W6QmqgkADuFcTLzHL8vVoNBtkwjvQRpYIAom7KiUNoLKghyx3FgH0GBjt8NRvigV1ZmMOBllvE1By1C+bi8WpA==
 
+"@parcel/watcher@2.0.4":
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher/-/watcher-2.0.4.tgz#f300fef4cc38008ff4b8c29d92588eced3ce014b"
+  integrity sha512-cTDi+FUDBIUOBKEtj+nhiJ71AZVlkAsQFuGQTun5tV9mwQBQgZvhCzG+URPQc8myeN32yRVZEfVAPCs1RW+Jvg==
+  dependencies:
+    node-addon-api "^3.2.1"
+    node-gyp-build "^4.3.0"
+
 "@pedrouid/environment@^1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@pedrouid/environment/-/environment-1.0.1.tgz#858f0f8a057340e0b250398b75ead77d6f4342ec"
@@ -5627,6 +5699,21 @@
   resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31"
   integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==
 
+"@yarnpkg/parsers@^3.0.0-rc.18":
+  version "3.0.0-rc.45"
+  resolved "https://registry.yarnpkg.com/@yarnpkg/parsers/-/parsers-3.0.0-rc.45.tgz#fcc7d0ab7828afdb20d1e13160b1d117c07536f4"
+  integrity sha512-Aj0aHBV/crFQTpKQvL6k1xNiOhnlfVLu06LunelQAvl1MTeWrSi8LD9UJJDCFJiG4kx8NysUE6Tx0KZyPQUzIw==
+  dependencies:
+    js-yaml "^3.10.0"
+    tslib "^2.4.0"
+
+"@zkochan/js-yaml@0.0.6":
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/@zkochan/js-yaml/-/js-yaml-0.0.6.tgz#975f0b306e705e28b8068a07737fa46d3fc04826"
+  integrity sha512-nzvgl3VfhcELQ8LyVrYOru+UtAy1nrygk2+AGbTm8a5YcO6o8lSjAT+pfg3vJWxIoZKOUhrK6UU7xW/+00kQrg==
+  dependencies:
+    argparse "^2.0.1"
+
 JSONStream@^1.0.4, JSONStream@^1.3.5:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0"
@@ -6184,6 +6271,15 @@ axios@0.21.2:
   dependencies:
     follow-redirects "^1.14.0"
 
+axios@1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.1.3.tgz#8274250dada2edf53814ed7db644b9c2866c1e35"
+  integrity sha512-00tXVRwKx/FZr/IDVFt4C+f9FYairX517WoGCL6dpOntqLkZofjhu43F/Xl44UOpqa+9sLFDrG/XAnFsUYgkDA==
+  dependencies:
+    follow-redirects "^1.15.0"
+    form-data "^4.0.0"
+    proxy-from-env "^1.1.0"
+
 axios@^0.19.2:
   version "0.19.2"
   resolved "https://registry.yarnpkg.com/axios/-/axios-0.19.2.tgz#3ea36c5d8818d0d5f8a8a97a6d36b86cdc00cb27"
@@ -6198,6 +6294,15 @@ axios@^0.21.0, axios@^0.21.1:
   dependencies:
     follow-redirects "^1.14.0"
 
+axios@^1.0.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.4.0.tgz#38a7bf1224cd308de271146038b551d725f0be1f"
+  integrity sha512-S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA==
+  dependencies:
+    follow-redirects "^1.15.0"
+    form-data "^4.0.0"
+    proxy-from-env "^1.1.0"
+
 axobject-query@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-3.1.1.tgz#3b6e5c6d4e43ca7ba51c5babf99d22a9c68485e1"
@@ -6571,7 +6676,7 @@ bindings@^1.3.0:
   dependencies:
     file-uri-to-path "1.0.0"
 
-bl@^4.0.0, bl@^4.1.0:
+bl@^4.0.0, bl@^4.0.3, bl@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a"
   integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==
@@ -7291,6 +7396,11 @@ chownr@^1.1.4:
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
   integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
 
+chownr@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
+  integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==
+
 chrome-trace-event@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac"
@@ -7373,13 +7483,18 @@ cli-boxes@^2.2.0:
   resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f"
   integrity sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==
 
-cli-cursor@^3.1.0:
+cli-cursor@3.1.0, cli-cursor@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
   integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==
   dependencies:
     restore-cursor "^3.1.0"
 
+cli-spinners@2.6.1:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.6.1.tgz#adc954ebe281c37a6319bfa401e6dd2488ffb70d"
+  integrity sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==
+
 cli-spinners@^2.2.0, cli-spinners@^2.5.0:
   version "2.7.0"
   resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.7.0.tgz#f815fd30b5f9eaac02db604c7a231ed7cb2f797a"
@@ -9135,7 +9250,7 @@ dotenv-expand@^5.1.0:
   resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-5.1.0.tgz#3fbaf020bfd794884072ea26b1e9791d45a629f0"
   integrity sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==
 
-dotenv@^10.0.0:
+dotenv@^10.0.0, dotenv@~10.0.0:
   version "10.0.0"
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-10.0.0.tgz#3d4227b8fb95f81096cdd2b66653fb2c7085ba81"
   integrity sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==
@@ -9176,7 +9291,7 @@ duplexer3@^0.1.4:
   resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.5.tgz#0b5e4d7bad5de8901ea4440624c8e1d20099217e"
   integrity sha512-1A8za6ws41LQgv9HrE/66jyC5yuSjQ3L/KOpFtoBilsAK2iA2wuS5rTt1OCzIvtS2V7nVmedsUU+DGRcjBmOYA==
 
-duplexer@^0.1.2:
+duplexer@^0.1.1, duplexer@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6"
   integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==
@@ -9345,7 +9460,7 @@ enhanced-resolve@^5.10.0:
     graceful-fs "^4.2.4"
     tapable "^2.2.0"
 
-enquirer@^2.3.6:
+enquirer@^2.3.6, enquirer@~2.3.6:
   version "2.3.6"
   resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d"
   integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==
@@ -10345,6 +10460,17 @@ fast-fifo@^1.0.0:
   resolved "https://registry.yarnpkg.com/fast-fifo/-/fast-fifo-1.1.0.tgz#17d1a3646880b9891dfa0c54e69c5fef33cad779"
   integrity sha512-Kl29QoNbNvn4nhDsLYjyIAaIqaJB6rBx5p3sL9VjaefJ+eMFBWVZiaoguaoZfzEKr5RhAti0UgM8703akGPJ6g==
 
+fast-glob@3.2.7:
+  version "3.2.7"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.7.tgz#fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1"
+  integrity sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==
+  dependencies:
+    "@nodelib/fs.stat" "^2.0.2"
+    "@nodelib/fs.walk" "^1.2.3"
+    glob-parent "^5.1.2"
+    merge2 "^1.3.0"
+    micromatch "^4.0.4"
+
 fast-glob@^3.2.12, fast-glob@^3.2.9:
   version "3.2.12"
   resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80"
@@ -10409,7 +10535,7 @@ fd-slicer@~1.1.0:
   dependencies:
     pend "~1.2.0"
 
-figures@^3.0.0, figures@^3.2.0:
+figures@3.2.0, figures@^3.0.0, figures@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af"
   integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==
@@ -10573,7 +10699,7 @@ follow-redirects@1.5.10:
   dependencies:
     debug "=3.1.0"
 
-follow-redirects@^1.0.0, follow-redirects@^1.14.0:
+follow-redirects@^1.0.0, follow-redirects@^1.14.0, follow-redirects@^1.15.0:
   version "1.15.2"
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13"
   integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==
@@ -10668,6 +10794,11 @@ fresh@0.5.2:
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
   integrity sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==
 
+fs-constants@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
+  integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==
+
 fs-extra@10.0.0:
   version "10.0.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.0.0.tgz#9ff61b655dde53fb34a82df84bb214ce802e17c1"
@@ -10686,7 +10817,7 @@ fs-extra@^10.0.0:
     jsonfile "^6.0.1"
     universalify "^2.0.0"
 
-fs-extra@^11.0.0:
+fs-extra@^11.0.0, fs-extra@^11.1.0:
   version "11.1.1"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.1.1.tgz#da69f7c39f3b002378b0954bb6ae7efdc0876e2d"
   integrity sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==
@@ -10739,6 +10870,13 @@ fs-minipass@^1.2.7:
   dependencies:
     minipass "^2.6.0"
 
+fs-minipass@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
+  integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==
+  dependencies:
+    minipass "^3.0.0"
+
 fs-monkey@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/fs-monkey/-/fs-monkey-1.0.3.tgz#ae3ac92d53bb328efe0e9a1d9541f6ad8d48e2d3"
@@ -10940,6 +11078,18 @@ glob-to-regexp@^0.4.1:
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
   integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
 
+glob@7.1.4:
+  version "7.1.4"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255"
+  integrity sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
 glob@7.1.7:
   version "7.1.7"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90"
@@ -11608,7 +11758,7 @@ ieee754@^1.1.13, ieee754@^1.2.1:
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
   integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
 
-ignore@^5.2.0:
+ignore@^5.0.4, ignore@^5.2.0:
   version "5.2.4"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324"
   integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==
@@ -13434,7 +13584,7 @@ js-yaml@4.1.0, js-yaml@^4.1.0:
   dependencies:
     argparse "^2.0.1"
 
-js-yaml@^3.13.1:
+js-yaml@^3.10.0, js-yaml@^3.13.1:
   version "3.14.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
   integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
@@ -13587,6 +13737,11 @@ json5@^2.1.2, json5@^2.2.0, json5@^2.2.2:
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
   integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
 
+jsonc-parser@3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.2.0.tgz#31ff3f4c2b9793f89c67212627c51c6394f88e76"
+  integrity sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==
+
 jsonfile@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
@@ -13796,6 +13951,11 @@ lines-and-columns@^1.1.6:
   resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632"
   integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==
 
+lines-and-columns@~2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-2.0.3.tgz#b2f0badedb556b747020ab8ea7f0373e22efac1b"
+  integrity sha512-cNOjgCnLB+FnvWWtyRTzmB3POJ+cXxTA81LoW7u8JdmhfXzriropYwpjShnz1QLLWsQwY7nIxoDmcPTwphDK9w==
+
 listr2@^3.8.3:
   version "3.14.0"
   resolved "https://registry.yarnpkg.com/listr2/-/listr2-3.14.0.tgz#23101cc62e1375fd5836b248276d1d2b51fdbe9e"
@@ -14436,6 +14596,13 @@ minimalistic-crypto-utils@^1.0.1:
   dependencies:
     brace-expansion "^1.1.7"
 
+minimatch@3.0.5:
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.5.tgz#4da8f1290ee0f0f8e83d60ca69f8f134068604a3"
+  integrity sha512-tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw==
+  dependencies:
+    brace-expansion "^1.1.7"
+
 minimatch@5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.0.1.tgz#fb9022f7528125187c92bd9e9b6366be1cf3415b"
@@ -14480,6 +14647,13 @@ minipass@^2.6.0, minipass@^2.9.0:
     safe-buffer "^5.1.2"
     yallist "^3.0.0"
 
+minipass@^3.0.0:
+  version "3.3.6"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.6.tgz#7bba384db3a1520d18c9c0e5251c3444e95dd94a"
+  integrity sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==
+  dependencies:
+    yallist "^4.0.0"
+
 minizlib@^1.3.3:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d"
@@ -14487,6 +14661,14 @@ minizlib@^1.3.3:
   dependencies:
     minipass "^2.9.0"
 
+minizlib@^2.1.1:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
+  integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==
+  dependencies:
+    minipass "^3.0.0"
+    yallist "^4.0.0"
+
 mkdirp-promise@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/mkdirp-promise/-/mkdirp-promise-5.0.1.tgz#e9b8f68e552c68a9c1713b84883f7a1dd039b8a1"
@@ -14506,7 +14688,7 @@ mkdirp@*:
   dependencies:
     minimist "^1.2.6"
 
-mkdirp@^1.0.4:
+mkdirp@^1.0.3, mkdirp@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
   integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
@@ -14873,6 +15055,11 @@ node-addon-api@^2.0.0:
   resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-2.0.2.tgz#432cfa82962ce494b132e9d72a15b29f71ff5d32"
   integrity sha512-Ntyt4AIXyaLIuMHF6IOoTakB3K+RWxwtsHNRxllEoA6vPwP9o4866g6YWDLUdnucilZhmkxiHwHr11gAENw+QA==
 
+node-addon-api@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161"
+  integrity sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==
+
 node-cache@^5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/node-cache/-/node-cache-5.1.2.tgz#f264dc2ccad0a780e76253a694e9fd0ed19c398d"
@@ -14928,6 +15115,11 @@ node-int64@^0.4.0:
   resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
   integrity sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==
 
+node-machine-id@^1.1.12:
+  version "1.1.12"
+  resolved "https://registry.yarnpkg.com/node-machine-id/-/node-machine-id-1.1.12.tgz#37904eee1e59b320bb9c5d6c0a59f3b469cb6267"
+  integrity sha512-QNABxbrPa3qEIfrE6GOJ7BYIuignnJw7iQ2YPbc3Nla1HzRJjXzZOiikfF8m7eAMfichLt3M4VgLOetqgDmgGQ==
+
 node-releases@^2.0.6:
   version "2.0.8"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.8.tgz#0f349cdc8fcfa39a92ac0be9bc48b7706292b9ae"
@@ -15042,6 +15234,73 @@ nwsapi@^2.2.0:
   resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.2.tgz#e5418863e7905df67d51ec95938d67bf801f0bb0"
   integrity sha512-90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw==
 
+nx-cloud@16.0.5, nx-cloud@latest:
+  version "16.0.5"
+  resolved "https://registry.yarnpkg.com/nx-cloud/-/nx-cloud-16.0.5.tgz#fa0b0185d254405ec47fcbcdbbd8b12ff1add096"
+  integrity sha512-13P7r0aKikjBtmdZrNorwXzVPeVIV4MLEwqGY+DEG6doLBtI5KqEQk/d5B5l2dCF2BEi/LXEmLYCmf9gwbOJ+Q==
+  dependencies:
+    "@nrwl/nx-cloud" "16.0.5"
+    axios "1.1.3"
+    chalk "^4.1.0"
+    dotenv "~10.0.0"
+    fs-extra "^11.1.0"
+    node-machine-id "^1.1.12"
+    open "~8.4.0"
+    strip-json-comments "^3.1.1"
+    tar "6.1.11"
+    yargs-parser ">=21.1.1"
+
+nx@16.3.2:
+  version "16.3.2"
+  resolved "https://registry.yarnpkg.com/nx/-/nx-16.3.2.tgz#92a2d7ef06d15b3b111b7cf9d35de08de0a22d90"
+  integrity sha512-fOzCVL7qoCJAcYTJwvJ9j+PSaL791ro4AICWuLxaphZsp2jcLoav4Ev7ONPks2Wlkt8FS9bee3nqQ3w1ya36Og==
+  dependencies:
+    "@nrwl/tao" "16.3.2"
+    "@parcel/watcher" "2.0.4"
+    "@yarnpkg/lockfile" "^1.1.0"
+    "@yarnpkg/parsers" "^3.0.0-rc.18"
+    "@zkochan/js-yaml" "0.0.6"
+    axios "^1.0.0"
+    chalk "^4.1.0"
+    cli-cursor "3.1.0"
+    cli-spinners "2.6.1"
+    cliui "^7.0.2"
+    dotenv "~10.0.0"
+    enquirer "~2.3.6"
+    fast-glob "3.2.7"
+    figures "3.2.0"
+    flat "^5.0.2"
+    fs-extra "^11.1.0"
+    glob "7.1.4"
+    ignore "^5.0.4"
+    js-yaml "4.1.0"
+    jsonc-parser "3.2.0"
+    lines-and-columns "~2.0.3"
+    minimatch "3.0.5"
+    npm-run-path "^4.0.1"
+    open "^8.4.0"
+    semver "7.3.4"
+    string-width "^4.2.3"
+    strong-log-transformer "^2.1.0"
+    tar-stream "~2.2.0"
+    tmp "~0.2.1"
+    tsconfig-paths "^4.1.2"
+    tslib "^2.3.0"
+    v8-compile-cache "2.3.0"
+    yargs "^17.6.2"
+    yargs-parser "21.1.1"
+  optionalDependencies:
+    "@nx/nx-darwin-arm64" "16.3.2"
+    "@nx/nx-darwin-x64" "16.3.2"
+    "@nx/nx-freebsd-x64" "16.3.2"
+    "@nx/nx-linux-arm-gnueabihf" "16.3.2"
+    "@nx/nx-linux-arm64-gnu" "16.3.2"
+    "@nx/nx-linux-arm64-musl" "16.3.2"
+    "@nx/nx-linux-x64-gnu" "16.3.2"
+    "@nx/nx-linux-x64-musl" "16.3.2"
+    "@nx/nx-win32-arm64-msvc" "16.3.2"
+    "@nx/nx-win32-x64-msvc" "16.3.2"
+
 oauth-sign@~0.9.0:
   version "0.9.0"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
@@ -15205,6 +15464,15 @@ open@^8.0.9, open@^8.4.0:
     is-docker "^2.1.1"
     is-wsl "^2.2.0"
 
+open@~8.4.0:
+  version "8.4.2"
+  resolved "https://registry.yarnpkg.com/open/-/open-8.4.2.tgz#5b5ffe2a8f793dcd2aad73e550cb87b59cb084f9"
+  integrity sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==
+  dependencies:
+    define-lazy-prop "^2.0.0"
+    is-docker "^2.1.1"
+    is-wsl "^2.2.0"
+
 opener@^1.5.2:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.2.tgz#5d37e1f35077b9dcac4301372271afdeb2a13598"
@@ -17890,6 +18158,13 @@ semver-diff@^3.1.1:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
 
+semver@7.3.4:
+  version "7.3.4"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97"
+  integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==
+  dependencies:
+    lru-cache "^6.0.0"
+
 semver@7.3.8, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8:
   version "7.3.8"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798"
@@ -18656,6 +18931,15 @@ strip-json-comments@~2.0.1:
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
   integrity sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==
 
+strong-log-transformer@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/strong-log-transformer/-/strong-log-transformer-2.1.0.tgz#0f5ed78d325e0421ac6f90f7f10e691d6ae3ae10"
+  integrity sha512-B3Hgul+z0L9a236FAUC9iZsL+nVHgoCJnqCbN588DjYxvGXaXaaFbfmQ/JhvKjZwsOukuR72XbHv71Qkug0HxA==
+  dependencies:
+    duplexer "^0.1.1"
+    minimist "^1.2.0"
+    through "^2.3.4"
+
 sturdy-websocket@^0.1.12:
   version "0.1.12"
   resolved "https://registry.yarnpkg.com/sturdy-websocket/-/sturdy-websocket-0.1.12.tgz#84bb779f948b585a695f76961dc7d1c4a5e87629"
@@ -18887,6 +19171,29 @@ tar-pack@^3.4.1:
     tar "^2.2.1"
     uid-number "^0.0.6"
 
+tar-stream@~2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287"
+  integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==
+  dependencies:
+    bl "^4.0.3"
+    end-of-stream "^1.4.1"
+    fs-constants "^1.0.0"
+    inherits "^2.0.3"
+    readable-stream "^3.1.1"
+
+tar@6.1.11:
+  version "6.1.11"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621"
+  integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==
+  dependencies:
+    chownr "^2.0.0"
+    fs-minipass "^2.0.0"
+    minipass "^3.0.0"
+    minizlib "^2.1.1"
+    mkdirp "^1.0.3"
+    yallist "^4.0.0"
+
 tar@^2.2.1:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.2.tgz#0ca8848562c7299b8b446ff6a4d60cdbb23edc40"
@@ -19034,7 +19341,7 @@ through2@~0.6.3:
     readable-stream ">=1.0.33-1 <1.1.0-0"
     xtend ">=4.0.0 <4.1.0-0"
 
-"through@>=2.2.7 <3", through@^2.3.6, through@^2.3.8:
+"through@>=2.2.7 <3", through@^2.3.4, through@^2.3.6, through@^2.3.8:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
   integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==
@@ -19270,6 +19577,15 @@ tsconfig-paths@^3.14.1:
     minimist "^1.2.6"
     strip-bom "^3.0.0"
 
+tsconfig-paths@^4.1.2:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz#ef78e19039133446d244beac0fd6a1632e2d107c"
+  integrity sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==
+  dependencies:
+    json5 "^2.2.2"
+    minimist "^1.2.6"
+    strip-bom "^3.0.0"
+
 tslib@1.14.1, tslib@^1.0.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
@@ -19280,6 +19596,11 @@ tslib@^2.0.0, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.4.1:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.1.tgz#0d0bfbaac2880b91e22df0768e55be9753a5b17e"
   integrity sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==
 
+tslib@^2.3.0, tslib@^2.4.0:
+  version "2.5.3"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.3.tgz#24944ba2d990940e6e982c4bea147aba80209913"
+  integrity sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==
+
 tsutils@^3.21.0:
   version "3.21.0"
   resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623"
@@ -19780,6 +20101,11 @@ v8-compile-cache-lib@^3.0.1:
   resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf"
   integrity sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==
 
+v8-compile-cache@2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
+  integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==
+
 v8-to-istanbul@^8.1.0:
   version "8.1.1"
   resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-8.1.1.tgz#77b752fd3975e31bbcef938f85e9bd1c7a8d60ed"
@@ -20930,6 +21256,11 @@ yargs-parser@20.2.4:
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54"
   integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==
 
+yargs-parser@21.1.1, yargs-parser@>=21.1.1, yargs-parser@^21.1.1:
+  version "21.1.1"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
+  integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
+
 yargs-parser@^10.0.0:
   version "10.1.0"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8"
@@ -20958,11 +21289,6 @@ yargs-parser@^20.2.2, yargs-parser@^20.2.3:
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
   integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
 
-yargs-parser@^21.1.1:
-  version "21.1.1"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
-  integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
-
 yargs-unparser@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/yargs-unparser/-/yargs-unparser-2.0.0.tgz#f131f9226911ae5d9ad38c432fe809366c2325eb"
@@ -21032,6 +21358,19 @@ yargs@^17.0.0:
     y18n "^5.0.5"
     yargs-parser "^21.1.1"
 
+yargs@^17.6.2:
+  version "17.7.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"
+  integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==
+  dependencies:
+    cliui "^8.0.1"
+    escalade "^3.1.1"
+    get-caller-file "^2.0.5"
+    require-directory "^2.1.1"
+    string-width "^4.2.3"
+    y18n "^5.0.5"
+    yargs-parser "^21.1.1"
+
 yauzl@^2.10.0:
   version "2.10.0"
   resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"

From 49b1273878ee6eb98add817c6da40c80ff01be95 Mon Sep 17 00:00:00 2001
From: Anxo Rodriguez <anxolin@gmail.com>
Date: Thu, 22 Jun 2023 14:01:52 +0100
Subject: [PATCH 28/67] Add library and UI library (#2699)

* chore: add lib ui

* docs: add documentation for ui libraty in readme

* chore: add lib

* chore: add react lib

* chore: add dependencies

* feat: allow to use ui components from other projects

* fix: fix circular dependency

* chore: use NX to run all tests

* fix: make test to work

* chore: lint fix

* chore: add build command

* Fix code style issues with Prettier

* fix: fix e2e

* chore: clean package

---------

Co-authored-by: Lint Action <lint-action@samuelmeuli.com>
---
 .../workflows/integration-tests.yaml          |    2 +-
 .github/uniswap-original/workflows/tests.yaml |    2 +-
 .verdaccio/config.yml                         |   29 +
 .verdaccio/htpasswd                           |    1 +
 README.md                                     |    9 +
 craco.config.js                               |    2 +
 jest.config.ts                                |    7 +
 jest.preset.js                                |    3 +
 nx.json                                       |   19 +-
 package.json                                  |   54 +-
 project.json                                  |   47 +
 src/.eslintrc.json                            |   13 +
 src/{ => common}/constants/common.ts          |    0
 src/{ => common}/constants/featureFlags.ts    |    0
 src/{ => common}/constants/intl.ts            |    0
 src/{ => common}/constants/launchDarkly.ts    |    0
 src/{ => common}/constants/quote.ts           |    0
 src/{ => common}/constants/routes.ts          |    1 +
 .../RequestCancellationModal.tsx              |    2 +-
 src/common/pure/FiatAmount/index.tsx          |    2 +-
 src/common/pure/TokenAmount/index.tsx         |    2 +-
 .../TransactionSubmittedContent/index.tsx     |    2 +-
 src/cow-react/index.tsx                       |    2 +-
 src/jest.config.ts                            |   13 +
 .../components/AmplitudeAnalytics/index.ts    |    4 +-
 .../ErrorBoundary/ErrorBoundaryMod.tsx        |    2 +-
 src/legacy/components/Header/index.tsx        |    2 +-
 .../FollowPendingTxPopupUI.tsx                |    2 +-
 src/legacy/components/Popups/PopupItem.tsx    |   96 +-
 src/legacy/components/Popups/PopupItemMod.tsx |  121 -
 src/legacy/components/Popups/PopupsMod.tsx    |   77 -
 .../components/Popups/TransactionPopup.tsx    |   49 +-
 .../components/Popups/TransactionPopupMod.tsx |   47 -
 src/legacy/components/Popups/index.tsx        |   75 +-
 src/legacy/components/Popups/styled.ts        |   69 +
 .../components/Tokens/TokensTableRow.tsx      |    2 +-
 .../usePriceImpact/useFallbackPriceImpact.ts  |    2 +-
 .../orders/middleware/appziMiddleware.test.ts |    2 +-
 .../updaters/UnfillableOrdersUpdater.ts       |    2 +-
 src/libs/ui-utils/.eslintrc.json              |   20 +
 src/libs/ui-utils/README.md                   |   11 +
 src/libs/ui-utils/jest.config.ts              |   10 +
 src/libs/ui-utils/package.json                |    5 +
 src/libs/ui-utils/project.json                |   41 +
 src/libs/ui-utils/src/index.ts                |    1 +
 src/libs/ui-utils/src/lib/return5.spec.ts     |    7 +
 src/libs/ui-utils/src/lib/return5.ts          |    3 +
 src/libs/ui-utils/tsconfig.json               |   22 +
 src/libs/ui-utils/tsconfig.lib.json           |   10 +
 src/libs/ui-utils/tsconfig.spec.json          |    9 +
 src/libs/ui-utils/vite.config.ts              |   48 +
 src/libs/ui/.eslintrc.json                    |   20 +
 src/libs/ui/README.md                         |    7 +
 src/libs/ui/jest.config.ts                    |   11 +
 src/libs/ui/package.json                      |   12 +
 src/libs/ui/project.json                      |   46 +
 src/libs/ui/src/index.ts                      |    1 +
 src/libs/ui/src/lib/ui.spec.tsx               |   10 +
 src/libs/ui/src/lib/ui.tsx                    |   16 +
 src/libs/ui/tsconfig.json                     |   21 +
 src/libs/ui/tsconfig.lib.json                 |   23 +
 src/libs/ui/tsconfig.spec.json                |   20 +
 src/libs/ui/vite.config.ts                    |   49 +
 .../application/containers/App/RoutesApp.tsx  |    5 +-
 .../containers/TradeWidgetLinks/index.tsx     |    2 +-
 .../application/containers/WithLDProvider.tsx |    2 +-
 .../containers/LimitOrdersWarnings/index.tsx  |    2 +-
 .../containers/RateInput/index.tsx            |    2 +-
 .../pure/LimitOrdersDetails/index.tsx         |    4 +-
 src/modules/mainMenu/constants/mainMenu.ts    |    2 +-
 src/modules/mainMenu/pure/MenuTree/index.tsx  |    2 +-
 src/modules/mainMenu/types.ts                 |    2 +-
 src/modules/mainMenu/utils.ts                 |    2 +-
 .../OrderRow/EstimatedExecutionPrice.tsx      |    2 +-
 .../pure/OrdersTableContainer/OrdersTable.tsx |    2 +-
 src/modules/trade/hooks/useTradeTypeInfo.ts   |    2 +-
 .../trade/utils/parameterizeTradeRoute.ts     |    2 +-
 .../wallet/api/pure/WalletModal/index.tsx     |    2 +-
 src/pages/About/index.tsx                     |    2 +-
 src/pages/Account/index.tsx                   |    2 +-
 src/pages/AdvancedOrders/index.tsx            |    2 +-
 src/pages/Claim/ClaimingStatus.tsx            |    2 +-
 src/pages/Faq/AffiliateFaq.tsx                |    2 +-
 src/pages/Faq/TokenFaq.tsx                    |    2 +-
 src/pages/Faq/index.tsx                       |    2 +-
 src/pages/KitchenSink/index.tsx               |   18 +
 src/pages/Swap/index.tsx                      |    2 +-
 src/utils/amountFormat/index.ts               |    2 +-
 tools/scripts/publish.mjs                     |   58 +
 tsconfig.base.json                            |    7 +-
 tsconfig.json                                 |    9 +-
 tsconfig.spec.json                            |    9 +
 yarn.lock                                     | 4454 ++++++++++++++++-
 93 files changed, 5318 insertions(+), 477 deletions(-)
 create mode 100644 .verdaccio/config.yml
 create mode 100644 .verdaccio/htpasswd
 create mode 100644 jest.config.ts
 create mode 100644 jest.preset.js
 create mode 100644 project.json
 create mode 100644 src/.eslintrc.json
 rename src/{ => common}/constants/common.ts (100%)
 rename src/{ => common}/constants/featureFlags.ts (100%)
 rename src/{ => common}/constants/intl.ts (100%)
 rename src/{ => common}/constants/launchDarkly.ts (100%)
 rename src/{ => common}/constants/quote.ts (100%)
 rename src/{ => common}/constants/routes.ts (96%)
 create mode 100644 src/jest.config.ts
 delete mode 100644 src/legacy/components/Popups/PopupItemMod.tsx
 delete mode 100644 src/legacy/components/Popups/PopupsMod.tsx
 delete mode 100644 src/legacy/components/Popups/TransactionPopupMod.tsx
 create mode 100644 src/legacy/components/Popups/styled.ts
 create mode 100644 src/libs/ui-utils/.eslintrc.json
 create mode 100644 src/libs/ui-utils/README.md
 create mode 100644 src/libs/ui-utils/jest.config.ts
 create mode 100644 src/libs/ui-utils/package.json
 create mode 100644 src/libs/ui-utils/project.json
 create mode 100644 src/libs/ui-utils/src/index.ts
 create mode 100644 src/libs/ui-utils/src/lib/return5.spec.ts
 create mode 100644 src/libs/ui-utils/src/lib/return5.ts
 create mode 100644 src/libs/ui-utils/tsconfig.json
 create mode 100644 src/libs/ui-utils/tsconfig.lib.json
 create mode 100644 src/libs/ui-utils/tsconfig.spec.json
 create mode 100644 src/libs/ui-utils/vite.config.ts
 create mode 100644 src/libs/ui/.eslintrc.json
 create mode 100644 src/libs/ui/README.md
 create mode 100644 src/libs/ui/jest.config.ts
 create mode 100644 src/libs/ui/package.json
 create mode 100644 src/libs/ui/project.json
 create mode 100644 src/libs/ui/src/index.ts
 create mode 100644 src/libs/ui/src/lib/ui.spec.tsx
 create mode 100644 src/libs/ui/src/lib/ui.tsx
 create mode 100644 src/libs/ui/tsconfig.json
 create mode 100644 src/libs/ui/tsconfig.lib.json
 create mode 100644 src/libs/ui/tsconfig.spec.json
 create mode 100644 src/libs/ui/vite.config.ts
 create mode 100644 src/pages/KitchenSink/index.tsx
 create mode 100644 tools/scripts/publish.mjs
 create mode 100644 tsconfig.spec.json

diff --git a/.github/uniswap-original/workflows/integration-tests.yaml b/.github/uniswap-original/workflows/integration-tests.yaml
index 18cd058e8a..625af36bc3 100644
--- a/.github/uniswap-original/workflows/integration-tests.yaml
+++ b/.github/uniswap-original/workflows/integration-tests.yaml
@@ -45,7 +45,7 @@ jobs:
           REACT_APP_NETWORK_URL: 'https://mainnet.infura.io/v3/4bf032f2d38a4ed6bb975b80d6340847'
           REACT_APP_SERVICE_WORKER: false
 
-      - run: yarn integration-test
+      - run: yarn e2e
         env:
           CYPRESS_INTEGRATION_TEST_PRIVATE_KEY: ${{ secrets.CYPRESS_INTEGRATION_TEST_PRIVATE_KEY }}
           CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
diff --git a/.github/uniswap-original/workflows/tests.yaml b/.github/uniswap-original/workflows/tests.yaml
index 07897f61b9..2170ddaa57 100644
--- a/.github/uniswap-original/workflows/tests.yaml
+++ b/.github/uniswap-original/workflows/tests.yaml
@@ -36,7 +36,7 @@ jobs:
         env:
           CI: false
           REACT_APP_NETWORK_URL: 'https://mainnet.infura.io/v3/586e7e6b7c7e437aa41f5da496a749f5'
-      - run: yarn integration-test
+      - run: yarn e2e
 
   unit-tests:
     name: Unit tests
diff --git a/.verdaccio/config.yml b/.verdaccio/config.yml
new file mode 100644
index 0000000000..1805e5ac80
--- /dev/null
+++ b/.verdaccio/config.yml
@@ -0,0 +1,29 @@
+# path to a directory with all packages
+storage: ../tmp/local-registry/storage
+
+auth:
+  htpasswd:
+    file: ./htpasswd
+
+# a list of other known repositories we can talk to
+uplinks:
+  npmjs:
+    url: https://registry.npmjs.org/
+    maxage: 60m
+
+packages:
+  '**':
+    # give all users (including non-authenticated users) full access
+    # because it is a local registry
+    access: $all
+    publish: $all
+    unpublish: $all
+
+    # if package is not available locally, proxy requests to npm registry
+    proxy: npmjs
+
+# log settings
+logs:
+  type: stdout
+  format: pretty
+  level: http
diff --git a/.verdaccio/htpasswd b/.verdaccio/htpasswd
new file mode 100644
index 0000000000..8391cd4b0a
--- /dev/null
+++ b/.verdaccio/htpasswd
@@ -0,0 +1 @@
+test:$6FrCaT/v0dwE:autocreated 2020-03-25T19:10:50.254Z
diff --git a/README.md b/README.md
index 64282bac93..f26b7b4b4e 100644
--- a/README.md
+++ b/README.md
@@ -77,6 +77,15 @@ This will start a server on the `http://localhost:5000/`
 yarn run cosmos
 ```
 
+## Build/test UI Library
+
+CoW Swap has a library of reusable components.
+
+```bash
+yarn ui:build
+yarn ui:test
+```
+
 ## Configuring the environment
 
 The app has some default configuration, but it's highly encouraged to define your own.
diff --git a/craco.config.js b/craco.config.js
index db43969195..1f6848c4c4 100644
--- a/craco.config.js
+++ b/craco.config.js
@@ -60,6 +60,8 @@ module.exports = {
     plugins,
     alias: {
       'bn.js': path.resolve(__dirname, 'node_modules/bn.js/lib/bn.js'),
+      '@cowprotocol/ui': path.resolve(__dirname, 'src/libs/ui/src/index.ts'),
+      '@cowprotocol/ui-utils': path.resolve(__dirname, 'src/libs/ui-utils/src/index.ts'),
     },
     // https://webpack.js.org/configuration
     configure: (webpackConfig) => ({
diff --git a/jest.config.ts b/jest.config.ts
new file mode 100644
index 0000000000..9b66958ca6
--- /dev/null
+++ b/jest.config.ts
@@ -0,0 +1,7 @@
+import { getJestProjects } from '@nx/jest'
+
+const config = {
+  projects: getJestProjects(),
+}
+
+export default config
diff --git a/jest.preset.js b/jest.preset.js
new file mode 100644
index 0000000000..8cd53f8e9b
--- /dev/null
+++ b/jest.preset.js
@@ -0,0 +1,3 @@
+const nxPreset = require('@nx/jest/preset').default
+
+module.exports = { ...nxPreset }
diff --git a/nx.json b/nx.json
index 148b0d5bdb..c7a5ef90a6 100644
--- a/nx.json
+++ b/nx.json
@@ -1,7 +1,12 @@
 {
   "namedInputs": {
     "default": ["{projectRoot}/**/*"],
-    "production": ["!{projectRoot}/**/*.test.tsx"]
+    "production": [
+      "!{projectRoot}/**/*.test.tsx",
+      "!{projectRoot}/**/?(*.)+(spec|test).[jt]s?(x)?(.snap)",
+      "!{projectRoot}/tsconfig.spec.json",
+      "!{projectRoot}/jest.config.[jt]s"
+    ]
   },
   "targetDefaults": {
     "build": {
@@ -10,7 +15,7 @@
       "outputs": ["{projectRoot}/build"]
     },
     "test": {
-      "inputs": ["default", "^production", "{workspaceRoot}/package.json"]
+      "inputs": ["default", "^production", "{workspaceRoot}/package.json", "{workspaceRoot}/jest.preset.js"]
     }
   },
   "tasksRunnerOptions": {
@@ -41,5 +46,15 @@
   },
   "affected": {
     "defaultBase": "develop"
+  },
+  "generators": {
+    "@nx/react": {
+      "application": {
+        "babel": true
+      },
+      "library": {
+        "unitTestRunner": "jest"
+      }
+    }
   }
 }
diff --git a/package.json b/package.json
index d2dcf55054..bc6658fa58 100644
--- a/package.json
+++ b/package.json
@@ -7,8 +7,10 @@
   "license": "ISC",
   "scripts": {
     "start": "nx exec -- craco start",
-    "build": "nx exec -- yarn _build ",
-    "test": "nx exec -- craco test --env=jsdom",
+    "build": "nx run-many -t build",
+    "build:cowswap": "nx build cowswap",
+    "test": "nx run-many -t test",
+    "e2e": "nx run-many -t e2e",
     "start:ssl": "nx exec -- HTTPS=true yarn start",
     "start:service-worker": "nx exec -- yarn _start:service-worker ",
     "lint:fix": "nx exec -- yarn run eslint --fix ./",
@@ -18,7 +20,6 @@
     "ipfs:publish": "nx exec -- ipfs-deploy build -p pinata -O",
     "test:debug": "nx exec -- craco --inspect-brk test --runInBand --no-cache",
     "eject": "react-scripts eject",
-    "integration-test": "nx exec -- start-server-and-test 'serve build -l 3000' http://localhost:3000 'cypress run'",
     "serve": "nx exec -- serve build -l 3000",
     "serve:ci": "nx exec -- serve website -l 3000",
     "cypress": "nx exec -- cypress open",
@@ -37,14 +38,12 @@
     "postinstall": "yarn contracts:compile && yarn i18n:compile && yarn patch-package",
     "prepare": "husky install",
     "prepublishOnly": "yarn widgets:build",
-    "test:e2e": "nx exec -- start-server-and-test 'serve build -l 3000' http://localhost:3000 'cypress run --record'",
     "cosmos:clear": "nx exec -- rm -rf ./public/cosmos",
     "cosmos:run": "nx exec -- yarn _cosmos:run ",
     "cosmos:export": "nx exec -- cross-env NODE_ENV=development cosmos-export",
     "widgets:build": "nx exec -- rollup --config --failAfterWarnings --configPlugin typescript2",
     "sitemap": "nx exec -- node src/sitemap",
     "writeVersion": "nx exec -- node src/writeVersion",
-    "_build": "yarn i18n:compile && craco build && yarn writeVersion",
     "_start:service-worker": "yarn build && yarn serve",
     "_contracts:compile": "yarn contracts:compile:abi && yarn contracts:compile:abi-ethflow && yarn contracts:add:export && yarn contracts:compile:abi-uniswap && yarn contracts:compile:v3",
     "_i18n:compile": "yarn i18n:extract && lingui compile",
@@ -81,6 +80,7 @@
     "@cowprotocol/cow-sdk": "^2.0.4",
     "@cowprotocol/ethflowcontract": "cowprotocol/ethflowcontract.git#v1.0.0-artifacts",
     "@davatar/react": "1.8.1",
+    "@ethersproject/bignumber": "^5.7.0",
     "@fontsource/ibm-plex-mono": "^4.5.1",
     "@fontsource/inter": "^4.5.1",
     "@ledgerhq/connect-kit-loader": "^1.0.2",
@@ -186,10 +186,12 @@
     "setimmediate": "^1.0.5",
     "simple-sitemap-renderer": "^1.1.0",
     "styled-components": "^5.3.0",
+    "styled-jsx": "5.1.2",
     "swr": "^1.0.1",
     "text-encoding-polyfill": "^0.6.7",
     "timeago.js": "^4.0.2",
     "tiny-invariant": "^1.2.0",
+    "tslib": "^2.3.0",
     "typescript": "^4.9.4",
     "ua-parser-js": "^1.0.32",
     "use-async-memo": "^1.2.4",
@@ -208,20 +210,25 @@
     "@commitlint/config-conventional": "^17.6.1",
     "@craco/craco": "^7.0.0",
     "@ethersproject/experimental": "^5.7.0",
+    "@nx/eslint-plugin": "^16.3.2",
+    "@nx/jest": "16.3.2",
+    "@nx/js": "16.3.2",
+    "@nx/react": "^16.3.2",
+    "@nx/vite": "16.3.2",
     "@simbathesailor/babel-plugin-use-what-changed": "^2.1.0",
     "@testing-library/jest-dom": "^5.16.5",
-    "@testing-library/react": "^13.4.0",
+    "@testing-library/react": "14.0.0",
     "@testing-library/react-hooks": "^8.0.1",
     "@testing-library/user-event": "^13.5.0",
     "@typechain/ethers-v5": "^10.2.0",
     "@types/clone-deep": "^4.0.1",
     "@types/d3": "^7.4.0",
-    "@types/jest": "^27.5.2",
+    "@types/jest": "^29.4.0",
     "@types/ms": "^0.7.31",
     "@types/ms.macro": "^2.0.0",
-    "@types/node": "^16.18.11",
-    "@types/react": "^18.0.26",
-    "@types/react-dom": "^18.0.10",
+    "@types/node": "18.14.2",
+    "@types/react": "18.0.28",
+    "@types/react-dom": "18.0.11",
     "@types/react-helmet": "^6.1.6",
     "@types/react-router-hash-link": "^2.4.5",
     "@types/react-virtualized-auto-sizer": "^1.0.1",
@@ -230,29 +237,50 @@
     "@types/styled-components": "^5.1.26",
     "@types/ua-parser-js": "^0.7.36",
     "@types/wcag-contrast": "^3.0.0",
+    "@vitejs/plugin-react": "^3.0.0",
+    "@vitest/ui": "^0.31.0",
     "assert": "^2.0.0",
+    "babel-jest": "^29.4.1",
     "craco-workbox": "^0.2.0",
     "create-react-app": "^5.0.1",
     "crypto-browserify": "^3.12.0",
     "cypress": "^12.4.1",
     "eslint-config-react-app": "^7.0.1",
     "eslint-plugin-cypress": "^2.12.1",
+    "eslint-plugin-import": "2.27.5",
+    "eslint-plugin-jsx-a11y": "6.7.1",
+    "eslint-plugin-react": "7.32.2",
+    "eslint-plugin-react-hooks": "4.6.0",
     "eslint-plugin-unused-imports": "^2.0.0",
     "https-browserify": "^1.0.0",
     "husky": "^8.0.3",
+    "jest": "^29.5.0",
+    "jest-environment-jsdom": "^29.5.0",
     "jest-fetch-mock": "^3.0.3",
     "jest-styled-components": "^7.1.1",
+    "jsdom": "~20.0.3",
     "launchdarkly-js-client-sdk": "^3.1.2",
+    "nx": "16.3.2",
+    "nx-cloud": "latest",
     "patch-package": "^6.5.1",
+    "prettier": "^2.6.2",
     "react-cosmos": "^5.7.2",
+    "serve": "^14.2.0",
+    "start-server-and-test": "^2.0.0",
     "stream": "^0.0.2",
     "stream-browserify": "^3.0.0",
     "stream-http": "^3.2.0",
+    "ts-jest": "^29.1.0",
     "ts-mockito": "^2.6.1",
+    "ts-node": "10.9.1",
     "typechain": "^8.1.1",
-    "webpack-bundle-analyzer": "^4.7.0",
-    "nx": "16.3.2",
-    "nx-cloud": "latest"
+    "verdaccio": "^5.0.4",
+    "vite": "^4.3.4",
+    "vite-plugin-dts": "~1.7.1",
+    "vite-plugin-eslint": "^1.8.1",
+    "vite-tsconfig-paths": "^4.0.2",
+    "vitest": "^0.31.0",
+    "webpack-bundle-analyzer": "^4.7.0"
   },
   "nx": {
     "targets": {
diff --git a/project.json b/project.json
new file mode 100644
index 0000000000..ced528c01b
--- /dev/null
+++ b/project.json
@@ -0,0 +1,47 @@
+{
+  "name": "cowswap",
+  "$schema": "node_modules/nx/schemas/project-schema.json",
+  "targets": {
+    "test": {
+      "executor": "nx:run-commands",
+      "options": {
+        "command": "craco test src --env=jsdom --testPathIgnorePatterns src/libs --no-watch --watchAll=false"
+      }
+    },
+    "build": {
+      "executor": "nx:run-commands",
+      "options": {
+        "command": "yarn i18n:compile && craco build && yarn writeVersion"
+      }
+    },
+    "e2e": {
+      "executor": "nx:run-commands",
+      "options": {
+        "command": "start-server-and-test 'serve build -l 3000' http://localhost:3000 'cypress run'"
+      },
+      "dependsOn": ["^build"]
+    },
+    "local-registry": {
+      "executor": "@nx/js:verdaccio",
+      "options": {
+        "port": 4873,
+        "config": ".verdaccio/config.yml",
+        "storage": "tmp/local-registry/storage"
+      }
+    },
+    "test:nx": {
+      "executor": "@nx/jest:jest",
+      "outputs": ["{workspaceRoot}/coverage/{projectName}"],
+      "options": {
+        "jestConfig": "jest.config.ts",
+        "passWithNoTests": true
+      },
+      "configurations": {
+        "ci": {
+          "ci": true,
+          "codeCoverage": true
+        }
+      }
+    }
+  }
+}
diff --git a/src/.eslintrc.json b/src/.eslintrc.json
new file mode 100644
index 0000000000..8f34c1b963
--- /dev/null
+++ b/src/.eslintrc.json
@@ -0,0 +1,13 @@
+{
+  "extends": ["react-app", "react-app/jest", "plugin:cypress/recommended", "../.eslintrc.json"],
+  "ignorePatterns": ["!**/*"],
+  "overrides": [
+    {
+      "files": ["cypress/**", "cypress-custom/**"],
+      "rules": {
+        "jest/valid-expect": 0,
+        "testing-library/await-async-utils": 0
+      }
+    }
+  ]
+}
diff --git a/src/constants/common.ts b/src/common/constants/common.ts
similarity index 100%
rename from src/constants/common.ts
rename to src/common/constants/common.ts
diff --git a/src/constants/featureFlags.ts b/src/common/constants/featureFlags.ts
similarity index 100%
rename from src/constants/featureFlags.ts
rename to src/common/constants/featureFlags.ts
diff --git a/src/constants/intl.ts b/src/common/constants/intl.ts
similarity index 100%
rename from src/constants/intl.ts
rename to src/common/constants/intl.ts
diff --git a/src/constants/launchDarkly.ts b/src/common/constants/launchDarkly.ts
similarity index 100%
rename from src/constants/launchDarkly.ts
rename to src/common/constants/launchDarkly.ts
diff --git a/src/constants/quote.ts b/src/common/constants/quote.ts
similarity index 100%
rename from src/constants/quote.ts
rename to src/common/constants/quote.ts
diff --git a/src/constants/routes.ts b/src/common/constants/routes.ts
similarity index 96%
rename from src/constants/routes.ts
rename to src/common/constants/routes.ts
index 8d379d5155..058f7d386d 100644
--- a/src/constants/routes.ts
+++ b/src/common/constants/routes.ts
@@ -26,4 +26,5 @@ export enum Routes {
   DOCS = '/docs',
   STATS = '/stats',
   TWITTER = '/twitter',
+  KITCHEN_SINK = '/kitchen-sink',
 }
diff --git a/src/common/pure/CancellationModal/RequestCancellationModal.tsx b/src/common/pure/CancellationModal/RequestCancellationModal.tsx
index dfe65cb41c..832637b012 100644
--- a/src/common/pure/CancellationModal/RequestCancellationModal.tsx
+++ b/src/common/pure/CancellationModal/RequestCancellationModal.tsx
@@ -12,9 +12,9 @@ import NotificationBanner from 'legacy/components/NotificationBanner'
 import { LegacyConfirmationModalContent } from 'legacy/components/TransactionConfirmationModal/LegacyConfirmationModalContent'
 import { LinkStyledButton } from 'legacy/theme'
 
+import { Routes } from 'common/constants/routes'
 import { CancellationType } from 'common/hooks/useCancelOrder/state'
 import { TokenAmount } from 'common/pure/TokenAmount'
-import { Routes } from 'constants/routes'
 
 export type RequestCancellationModalProps = {
   summary?: string
diff --git a/src/common/pure/FiatAmount/index.tsx b/src/common/pure/FiatAmount/index.tsx
index 89edd8525e..2b9d656353 100644
--- a/src/common/pure/FiatAmount/index.tsx
+++ b/src/common/pure/FiatAmount/index.tsx
@@ -3,7 +3,7 @@ import { FractionLike, Nullish } from 'types'
 
 import { LONG_PRECISION } from 'legacy/constants'
 
-import { AMOUNTS_FORMATTING_FEATURE_FLAG } from 'constants/featureFlags'
+import { AMOUNTS_FORMATTING_FEATURE_FLAG } from 'common/constants/featureFlags'
 import { formatFiatAmount } from 'utils/amountFormat'
 import { FeatureFlag } from 'utils/featureFlags'
 import { FractionUtils } from 'utils/fractionUtils'
diff --git a/src/common/pure/TokenAmount/index.tsx b/src/common/pure/TokenAmount/index.tsx
index 58271bdd6e..5fbcdb2bf0 100644
--- a/src/common/pure/TokenAmount/index.tsx
+++ b/src/common/pure/TokenAmount/index.tsx
@@ -4,8 +4,8 @@ import { FractionLike, Nullish } from 'types'
 
 import { LONG_PRECISION } from 'legacy/constants'
 
+import { AMOUNTS_FORMATTING_FEATURE_FLAG } from 'common/constants/featureFlags'
 import { TokenSymbol, TokenSymbolProps } from 'common/pure/TokenSymbol'
-import { AMOUNTS_FORMATTING_FEATURE_FLAG } from 'constants/featureFlags'
 import { formatTokenAmount } from 'utils/amountFormat'
 import { FeatureFlag } from 'utils/featureFlags'
 import { FractionUtils } from 'utils/fractionUtils'
diff --git a/src/common/pure/TransactionSubmittedContent/index.tsx b/src/common/pure/TransactionSubmittedContent/index.tsx
index faae800b49..d7c6db7b70 100644
--- a/src/common/pure/TransactionSubmittedContent/index.tsx
+++ b/src/common/pure/TransactionSubmittedContent/index.tsx
@@ -18,7 +18,7 @@ import { ActivityDerivedState } from 'modules/account/containers/Transaction'
 import { EthFlowStepper } from 'modules/swap/containers/EthFlowStepper'
 import AddToMetamask from 'modules/wallet/web3-react/containers/AddToMetamask'
 
-import { Routes } from 'constants/routes'
+import { Routes } from 'common/constants/routes'
 
 import * as styledEl from './styled'
 
diff --git a/src/cow-react/index.tsx b/src/cow-react/index.tsx
index f12aeb39fe..5a71fd1767 100644
--- a/src/cow-react/index.tsx
+++ b/src/cow-react/index.tsx
@@ -15,7 +15,7 @@ import * as serviceWorkerRegistration from 'serviceWorkerRegistration'
 
 import AppziButton from 'legacy/components/AppziButton'
 import Blocklist from 'legacy/components/Blocklist'
-import Popups from 'legacy/components/Popups'
+import { Popups } from 'legacy/components/Popups'
 import Web3Provider from 'legacy/components/Web3Provider'
 import store from 'legacy/state'
 import ThemeProvider, { FixedGlobalStyle, ThemedGlobalStyle } from 'legacy/theme'
diff --git a/src/jest.config.ts b/src/jest.config.ts
new file mode 100644
index 0000000000..191e42a220
--- /dev/null
+++ b/src/jest.config.ts
@@ -0,0 +1,13 @@
+// this is not used for now. we use "craco test", but eventually we will
+
+/* eslint-disable */
+export default {
+  displayName: 'cowswap',
+  preset: '../jest.preset.js',
+  transform: {
+    '^(?!.*\\.(js|jsx|ts|tsx|css|json)$)': '@nx/react/plugins/jest',
+    '^.+\\.[tj]sx?$': ['babel-jest', { presets: ['@nx/react/babel'] }],
+  },
+  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
+  coverageDirectory: '../../coverage/cowswap',
+}
diff --git a/src/legacy/components/AmplitudeAnalytics/index.ts b/src/legacy/components/AmplitudeAnalytics/index.ts
index d6533cc94d..f056e58a21 100644
--- a/src/legacy/components/AmplitudeAnalytics/index.ts
+++ b/src/legacy/components/AmplitudeAnalytics/index.ts
@@ -7,9 +7,9 @@ import { Identify, identify, init, track } from '@amplitude/analytics-browser'
  * member of the organization on Amplitude to view details.
  */
 export function initializeAnalytics(isDevEnvironment = process.env.NODE_ENV === 'development') {
-  if (isDevEnvironment) return
-
   const API_KEY = process.env.REACT_APP_AMPLITUDE_KEY
+  if (isDevEnvironment || !API_KEY) return
+
   if (typeof API_KEY === 'undefined') {
     throw new Error(`REACT_APP_AMPLITUDE_KEY must be a defined environment variable`)
   }
diff --git a/src/legacy/components/ErrorBoundary/ErrorBoundaryMod.tsx b/src/legacy/components/ErrorBoundary/ErrorBoundaryMod.tsx
index ff4d46a6fa..5e68f2110a 100644
--- a/src/legacy/components/ErrorBoundary/ErrorBoundaryMod.tsx
+++ b/src/legacy/components/ErrorBoundary/ErrorBoundaryMod.tsx
@@ -15,7 +15,7 @@ import { MEDIA_WIDTHS } from 'legacy/theme'
 
 import { Page } from 'modules/application/pure/Page'
 
-import { Routes } from 'constants/routes'
+import { Routes } from 'common/constants/routes'
 
 /* const FallbackWrapper = styled.div`
   display: flex;
diff --git a/src/legacy/components/Header/index.tsx b/src/legacy/components/Header/index.tsx
index 30981bc97e..8e08f4c30f 100644
--- a/src/legacy/components/Header/index.tsx
+++ b/src/legacy/components/Header/index.tsx
@@ -23,8 +23,8 @@ import { useTradeState } from 'modules/trade/hooks/useTradeState'
 import { getDefaultTradeRawState } from 'modules/trade/types/TradeRawState'
 import { useWalletInfo, Web3Status } from 'modules/wallet'
 
+import { Routes } from 'common/constants/routes'
 import { TokenAmount } from 'common/pure/TokenAmount'
-import { Routes } from 'constants/routes'
 
 import MobileMenuIcon from './MobileMenuIcon'
 import {
diff --git a/src/legacy/components/Popups/FollowPendingTxPopup/FollowPendingTxPopupUI.tsx b/src/legacy/components/Popups/FollowPendingTxPopup/FollowPendingTxPopupUI.tsx
index 1f66f6a644..8f5d1c36f6 100644
--- a/src/legacy/components/Popups/FollowPendingTxPopup/FollowPendingTxPopupUI.tsx
+++ b/src/legacy/components/Popups/FollowPendingTxPopup/FollowPendingTxPopupUI.tsx
@@ -4,7 +4,7 @@ import { Text } from 'rebass'
 import styled from 'styled-components/macro'
 
 import { AutoColumn } from 'legacy/components/Column'
-import { StyledClose as IconClose } from 'legacy/components/Popups/PopupItemMod'
+import { StyledClose as IconClose } from 'legacy/components/Popups/styled'
 import Tooltip, { TooltipProps } from 'legacy/components/Tooltip'
 
 interface PopupContentProps {
diff --git a/src/legacy/components/Popups/PopupItem.tsx b/src/legacy/components/Popups/PopupItem.tsx
index 0d07865ccf..bda9448bf1 100644
--- a/src/legacy/components/Popups/PopupItem.tsx
+++ b/src/legacy/components/Popups/PopupItem.tsx
@@ -1,34 +1,15 @@
-import styled from 'styled-components/macro'
+import { useCallback, useContext, useEffect } from 'react'
 
-import { PopupContent } from 'legacy/state/application/reducer'
-
-import { default as PopupItemUni, Popup, Fader } from './PopupItemMod'
+import { useSpring } from '@react-spring/web'
+import { ThemeContext } from 'styled-components/macro'
 
-const Wrapper = styled.div`
-  ${Popup} {
-    ${({ theme }) => theme.mediaWidth.upToSmall`
-      margin: 0 0 16px;
-      min-width: 100%;
-    `}
-  }
-
-  ${Fader} {
-    background-color: ${({ theme }) => theme.disabled};
-    height: 4px;
-  }
-
-  a {
-    text-decoration: underline;
-    color: ${({ theme }) => theme.textLink};
-  }
-`
+import FailedNetworkSwitchPopup from 'legacy/components/Popups/FailedNetworkSwitchPopup'
+import { WarningPopup } from 'legacy/components/Popups/WarningPopup'
+import { useRemovePopup } from 'legacy/state/application/hooks'
+import { PopupContent } from 'legacy/state/application/reducer'
 
-export const PopupItemWrapper = styled(PopupItemUni)`
-  ${(props) => props.className} {
-    border: 2px solid ${({ theme }) => theme.black};
-    box-shadow: 2px 2px 0 ${({ theme }) => theme.black};
-  }
-`
+import { AnimatedFader, PopupItemWrapper, PopupWrapper, StyledClose } from './styled'
+import { TransactionPopup } from './TransactionPopup'
 
 export function PopupItem({
   removeAfterMs,
@@ -39,11 +20,60 @@ export function PopupItem({
   content: PopupContent
   popKey: string
 }) {
+  const removePopup = useRemovePopup()
+  const removeThisPopup = useCallback(() => removePopup(popKey), [popKey, removePopup])
+  useEffect(() => {
+    if (removeAfterMs === null) return undefined
+
+    const timeout = setTimeout(() => {
+      removeThisPopup()
+    }, removeAfterMs)
+
+    return () => {
+      clearTimeout(timeout)
+    }
+  }, [removeAfterMs, removeThisPopup])
+
+  const theme = useContext(ThemeContext)
+
+  // mod
+  const isTxn = 'txn' in content
+  const isUnsupportedNetwork = 'unsupportedNetwork' in content
+  const isMetaTxn = 'metatxn' in content
+  const isWarningTxn = 'warning' in content
+
+  let popupContent
+  if (isTxn) {
+    const {
+      txn: { hash, success, summary },
+    } = content
+    popupContent = <TransactionPopup hash={hash} success={success} summary={summary} />
+  } else if (isMetaTxn) {
+    const {
+      metatxn: { id, success, summary },
+    } = content
+    popupContent = <TransactionPopup hash={id} success={success} summary={summary} />
+  } else if (isUnsupportedNetwork) {
+    popupContent = <FailedNetworkSwitchPopup chainId={content.failedSwitchNetwork} isUnsupportedNetwork />
+  } else if ('failedSwitchNetwork' in content) {
+    popupContent = <FailedNetworkSwitchPopup chainId={content.failedSwitchNetwork} />
+  } else if (isWarningTxn) {
+    popupContent = <WarningPopup warning={content.warning} />
+  }
+
+  const faderStyle = useSpring({
+    from: { width: '100%' },
+    to: { width: '0%' },
+    config: { duration: removeAfterMs ?? undefined },
+  })
+
   return (
-    <Wrapper>
-      <PopupItemWrapper removeAfterMs={removeAfterMs} content={content} popKey={popKey} />
-    </Wrapper>
+    <PopupItemWrapper>
+      <PopupWrapper css={content.styles}>
+        <StyledClose stroke={isUnsupportedNetwork ? theme.black : theme.text2} onClick={removeThisPopup} />
+        {popupContent}
+        {removeAfterMs !== null ? <AnimatedFader style={faderStyle} /> : null}
+      </PopupWrapper>
+    </PopupItemWrapper>
   )
 }
-
-export default PopupItem
diff --git a/src/legacy/components/Popups/PopupItemMod.tsx b/src/legacy/components/Popups/PopupItemMod.tsx
deleted file mode 100644
index 6438dcfe29..0000000000
--- a/src/legacy/components/Popups/PopupItemMod.tsx
+++ /dev/null
@@ -1,121 +0,0 @@
-import { useCallback, useContext, useEffect } from 'react'
-
-import { animated, useSpring } from '@react-spring/web'
-import { X } from 'react-feather'
-import styled, { FlattenInterpolation, ThemeContext, ThemeProps, DefaultTheme } from 'styled-components/macro'
-
-import FailedNetworkSwitchPopup from 'legacy/components/Popups/FailedNetworkSwitchPopup'
-import { WarningPopup } from 'legacy/components/Popups/WarningPopup'
-import { useRemovePopup } from 'legacy/state/application/hooks'
-import { PopupContent } from 'legacy/state/application/reducer'
-
-import TransactionPopup from './TransactionPopupMod'
-
-// MOD imports
-
-export const StyledClose = styled(X)`
-  position: absolute;
-  right: 10px;
-  top: 10px;
-
-  :hover {
-    cursor: pointer;
-  }
-`
-export const Popup = styled.div<{ css?: FlattenInterpolation<ThemeProps<DefaultTheme>> }>`
-  display: inline-block;
-  width: 100%;
-  //padding: 1em;
-  background-color: ${({ theme }) => theme.bg1};
-  position: relative;
-  border-radius: 10px;
-  padding: 20px;
-  padding-right: 35px;
-  overflow: hidden;
-
-  ${({ theme }) => theme.mediaWidth.upToSmall`
-    min-width: 290px;
-    &:not(:last-of-type) {
-      margin-right: 20px;
-    }
-  `}
-
-  ${({ css }) => css && css}
-`
-export const Fader = styled.div`
-  position: absolute;
-  bottom: 0px;
-  left: 0px;
-  width: 100%;
-  height: 2px;
-  background-color: ${({ theme }) => theme.bg3};
-`
-
-const AnimatedFader = animated(Fader)
-
-export default function PopupItem({
-  removeAfterMs,
-  content,
-  popKey,
-  className, // mod
-}: {
-  removeAfterMs: number | null
-  content: PopupContent
-  popKey: string
-  className?: string
-}) {
-  const removePopup = useRemovePopup()
-  const removeThisPopup = useCallback(() => removePopup(popKey), [popKey, removePopup])
-  useEffect(() => {
-    if (removeAfterMs === null) return undefined
-
-    const timeout = setTimeout(() => {
-      removeThisPopup()
-    }, removeAfterMs)
-
-    return () => {
-      clearTimeout(timeout)
-    }
-  }, [removeAfterMs, removeThisPopup])
-
-  const theme = useContext(ThemeContext)
-
-  // mod
-  const isTxn = 'txn' in content
-  const isUnsupportedNetwork = 'unsupportedNetwork' in content
-  const isMetaTxn = 'metatxn' in content
-  const isWarningTxn = 'warning' in content
-
-  let popupContent
-  if (isTxn) {
-    const {
-      txn: { hash, success, summary },
-    } = content
-    popupContent = <TransactionPopup hash={hash} success={success} summary={summary} />
-  } else if (isMetaTxn) {
-    const {
-      metatxn: { id, success, summary },
-    } = content
-    popupContent = <TransactionPopup hash={id} success={success} summary={summary} />
-  } else if (isUnsupportedNetwork) {
-    popupContent = <FailedNetworkSwitchPopup chainId={content.failedSwitchNetwork} isUnsupportedNetwork />
-  } else if ('failedSwitchNetwork' in content) {
-    popupContent = <FailedNetworkSwitchPopup chainId={content.failedSwitchNetwork} />
-  } else if (isWarningTxn) {
-    popupContent = <WarningPopup warning={content.warning} />
-  }
-
-  const faderStyle = useSpring({
-    from: { width: '100%' },
-    to: { width: '0%' },
-    config: { duration: removeAfterMs ?? undefined },
-  })
-
-  return (
-    <Popup className={className} css={content.styles}>
-      <StyledClose stroke={isUnsupportedNetwork ? theme.black : theme.text2} onClick={removeThisPopup} />
-      {popupContent}
-      {removeAfterMs !== null ? <AnimatedFader style={faderStyle} /> : null}
-    </Popup>
-  )
-}
diff --git a/src/legacy/components/Popups/PopupsMod.tsx b/src/legacy/components/Popups/PopupsMod.tsx
deleted file mode 100644
index 3f15276e35..0000000000
--- a/src/legacy/components/Popups/PopupsMod.tsx
+++ /dev/null
@@ -1,77 +0,0 @@
-import { SupportedChainId } from '@cowprotocol/cow-sdk'
-
-import styled from 'styled-components/macro'
-
-import { AutoColumn } from 'legacy/components/Column'
-import PopupItem from 'legacy/components/Popups/PopupItem'
-import { useActivePopups } from 'legacy/state/application/hooks'
-import { useURLWarningVisible } from 'legacy/state/user/hooks'
-import { MEDIA_WIDTHS } from 'legacy/theme'
-
-import { useWalletInfo } from 'modules/wallet'
-
-import { MobilePopupWrapper } from './index'
-
-export const MobilePopupInner = styled.div`
-  height: 99%;
-  overflow-x: auto;
-  overflow-y: hidden;
-  display: flex;
-  flex-direction: row;
-  -webkit-overflow-scrolling: touch;
-  ::-webkit-scrollbar {
-    display: none;
-  }
-`
-
-const StopOverflowQuery = `@media screen and (min-width: ${MEDIA_WIDTHS.upToMedium + 1}px) and (max-width: ${
-  MEDIA_WIDTHS.upToMedium + 500
-}px)`
-
-const FixedPopupColumn = styled(AutoColumn)<{ extraPadding: boolean; xlPadding: boolean }>`
-  position: fixed;
-  top: ${({ extraPadding }) => (extraPadding ? '132px' : '88px')};
-  right: 1rem;
-  max-width: 355px !important;
-  width: 100%;
-  z-index: 3;
-
-  ${({ theme }) => theme.mediaWidth.upToSmall`
-    display: none;
-  `};
-
-  ${StopOverflowQuery} {
-    top: ${({ extraPadding, xlPadding }) => (xlPadding ? '132px' : extraPadding ? '64px' : '56px')};
-  }
-`
-
-export default function Popups() {
-  // get all popups
-  const activePopups = useActivePopups()
-
-  const urlWarningActive = useURLWarningVisible()
-
-  // need extra padding if network is not L1 Ethereum
-  const { chainId } = useWalletInfo()
-  const isNotOnMainnet = Boolean(chainId && chainId !== SupportedChainId.MAINNET)
-
-  return (
-    <>
-      <FixedPopupColumn gap="20px" extraPadding={urlWarningActive} xlPadding={isNotOnMainnet}>
-        {activePopups.map((item) => (
-          <PopupItem key={item.key} content={item.content} popKey={item.key} removeAfterMs={item.removeAfterMs} />
-        ))}
-      </FixedPopupColumn>
-      <MobilePopupWrapper show={activePopups?.length > 0}>
-        <MobilePopupInner>
-          {activePopups // reverse so new items up front
-            .slice(0)
-            .reverse()
-            .map((item) => (
-              <PopupItem key={item.key} content={item.content} popKey={item.key} removeAfterMs={item.removeAfterMs} />
-            ))}
-        </MobilePopupInner>
-      </MobilePopupWrapper>
-    </>
-  )
-}
diff --git a/src/legacy/components/Popups/TransactionPopup.tsx b/src/legacy/components/Popups/TransactionPopup.tsx
index 65010a7c26..7ef87eeeab 100644
--- a/src/legacy/components/Popups/TransactionPopup.tsx
+++ b/src/legacy/components/Popups/TransactionPopup.tsx
@@ -1,2 +1,47 @@
-export * from './TransactionPopupMod'
-export { default } from './TransactionPopupMod'
+import { useContext } from 'react'
+
+import { AlertCircle, CheckCircle } from 'react-feather'
+import styled, { ThemeContext } from 'styled-components/macro'
+
+import { AutoColumn } from 'legacy/components/Column'
+import { ExplorerLink } from 'legacy/components/ExplorerLink'
+import { AutoRow } from 'legacy/components/Row'
+import { ThemedText } from 'legacy/theme'
+
+import { useWalletInfo } from 'modules/wallet'
+
+const RowNoFlex = styled(AutoRow)`
+  flex-wrap: nowrap;
+`
+
+export function TransactionPopup({
+  hash,
+  success,
+  summary,
+}: {
+  hash: string
+  success?: boolean
+  summary?: string | JSX.Element
+}) {
+  const { chainId } = useWalletInfo()
+
+  const theme = useContext(ThemeContext)
+
+  return (
+    <RowNoFlex>
+      <div style={{ paddingRight: 16 }}>
+        {success ? <CheckCircle color={theme.green1} size={24} /> : <AlertCircle color={theme.red1} size={24} />}
+      </div>
+      <AutoColumn gap="8px">
+        {!summary || typeof summary === 'string' ? (
+          <ThemedText.Body fontWeight={500} style={{ whiteSpace: 'pre-wrap' }}>
+            {summary ?? 'Hash: ' + hash.slice(0, 8) + '...' + hash.slice(58, 65)}
+          </ThemedText.Body>
+        ) : (
+          summary
+        )}
+        {chainId && <ExplorerLink id={hash} />}
+      </AutoColumn>
+    </RowNoFlex>
+  )
+}
diff --git a/src/legacy/components/Popups/TransactionPopupMod.tsx b/src/legacy/components/Popups/TransactionPopupMod.tsx
deleted file mode 100644
index 8398e4ee95..0000000000
--- a/src/legacy/components/Popups/TransactionPopupMod.tsx
+++ /dev/null
@@ -1,47 +0,0 @@
-import { useContext } from 'react'
-
-import { AlertCircle, CheckCircle } from 'react-feather'
-import styled, { ThemeContext } from 'styled-components/macro'
-
-import { AutoColumn } from 'legacy/components/Column'
-import { ExplorerLink } from 'legacy/components/ExplorerLink'
-import { AutoRow } from 'legacy/components/Row'
-import { ThemedText } from 'legacy/theme'
-
-import { useWalletInfo } from 'modules/wallet'
-
-const RowNoFlex = styled(AutoRow)`
-  flex-wrap: nowrap;
-`
-
-export default function TransactionPopup({
-  hash,
-  success,
-  summary,
-}: {
-  hash: string
-  success?: boolean
-  summary?: string | JSX.Element
-}) {
-  const { chainId } = useWalletInfo()
-
-  const theme = useContext(ThemeContext)
-
-  return (
-    <RowNoFlex>
-      <div style={{ paddingRight: 16 }}>
-        {success ? <CheckCircle color={theme.green1} size={24} /> : <AlertCircle color={theme.red1} size={24} />}
-      </div>
-      <AutoColumn gap="8px">
-        {!summary || typeof summary === 'string' ? (
-          <ThemedText.Body fontWeight={500} style={{ whiteSpace: 'pre-wrap' }}>
-            {summary ?? 'Hash: ' + hash.slice(0, 8) + '...' + hash.slice(58, 65)}
-          </ThemedText.Body>
-        ) : (
-          summary
-        )}
-        {chainId && <ExplorerLink id={hash} />}
-      </AutoColumn>
-    </RowNoFlex>
-  )
-}
diff --git a/src/legacy/components/Popups/index.tsx b/src/legacy/components/Popups/index.tsx
index 1128a316cf..5332d36975 100644
--- a/src/legacy/components/Popups/index.tsx
+++ b/src/legacy/components/Popups/index.tsx
@@ -1,7 +1,27 @@
+import { SupportedChainId } from '@cowprotocol/cow-sdk'
+
 import { transparentize } from 'polished'
 import styled from 'styled-components/macro'
 
-import { MobilePopupInner } from './PopupsMod'
+import { AutoColumn } from 'legacy/components/Column'
+import { PopupItem } from 'legacy/components/Popups/PopupItem'
+import { useActivePopups } from 'legacy/state/application/hooks'
+import { useURLWarningVisible } from 'legacy/state/user/hooks'
+import { MEDIA_WIDTHS } from 'legacy/theme'
+
+import { useWalletInfo } from 'modules/wallet'
+
+export const MobilePopupInner = styled.div`
+  height: 99%;
+  overflow-x: auto;
+  overflow-y: hidden;
+  display: flex;
+  flex-direction: row;
+  -webkit-overflow-scrolling: touch;
+  ::-webkit-scrollbar {
+    display: none;
+  }
+`
 
 export const MobilePopupWrapper = styled.div<{ show: boolean }>`
   position: relative;
@@ -31,5 +51,54 @@ export const MobilePopupWrapper = styled.div<{ show: boolean }>`
   }
 `
 
-export * from './PopupsMod'
-export { default } from './PopupsMod'
+const StopOverflowQuery = `@media screen and (min-width: ${MEDIA_WIDTHS.upToMedium + 1}px) and (max-width: ${
+  MEDIA_WIDTHS.upToMedium + 500
+}px)`
+
+const FixedPopupColumn = styled(AutoColumn)<{ extraPadding: boolean; xlPadding: boolean }>`
+  position: fixed;
+  top: ${({ extraPadding }) => (extraPadding ? '132px' : '88px')};
+  right: 1rem;
+  max-width: 355px !important;
+  width: 100%;
+  z-index: 3;
+
+  ${({ theme }) => theme.mediaWidth.upToSmall`
+    display: none;
+  `};
+
+  ${StopOverflowQuery} {
+    top: ${({ extraPadding, xlPadding }) => (xlPadding ? '132px' : extraPadding ? '64px' : '56px')};
+  }
+`
+
+export function Popups() {
+  // get all popups
+  const activePopups = useActivePopups()
+
+  const urlWarningActive = useURLWarningVisible()
+
+  // need extra padding if network is not L1 Ethereum
+  const { chainId } = useWalletInfo()
+  const isNotOnMainnet = Boolean(chainId && chainId !== SupportedChainId.MAINNET)
+
+  return (
+    <>
+      <FixedPopupColumn gap="20px" extraPadding={urlWarningActive} xlPadding={isNotOnMainnet}>
+        {activePopups.map((item) => (
+          <PopupItem key={item.key} content={item.content} popKey={item.key} removeAfterMs={item.removeAfterMs} />
+        ))}
+      </FixedPopupColumn>
+      <MobilePopupWrapper show={activePopups?.length > 0}>
+        <MobilePopupInner>
+          {activePopups // reverse so new items up front
+            .slice(0)
+            .reverse()
+            .map((item) => (
+              <PopupItem key={item.key} content={item.content} popKey={item.key} removeAfterMs={item.removeAfterMs} />
+            ))}
+        </MobilePopupInner>
+      </MobilePopupWrapper>
+    </>
+  )
+}
diff --git a/src/legacy/components/Popups/styled.ts b/src/legacy/components/Popups/styled.ts
new file mode 100644
index 0000000000..47baad791a
--- /dev/null
+++ b/src/legacy/components/Popups/styled.ts
@@ -0,0 +1,69 @@
+import { animated } from '@react-spring/web'
+import { X } from 'react-feather'
+import styled, { DefaultTheme, FlattenInterpolation, ThemeProps } from 'styled-components/macro'
+
+const Fader = styled.div`
+  position: absolute;
+  bottom: 0px;
+  left: 0px;
+  width: 100%;
+  height: 2px;
+  background-color: ${({ theme }) => theme.bg3};
+`
+
+export const PopupWrapper = styled.div<{ css?: FlattenInterpolation<ThemeProps<DefaultTheme>> }>`
+  display: inline-block;
+  width: 100%;
+  //padding: 1em;
+  background-color: ${({ theme }) => theme.bg1};
+  position: relative;
+  border-radius: 10px;
+  padding: 20px;
+  padding-right: 35px;
+  overflow: hidden;
+
+  ${({ theme }) => theme.mediaWidth.upToSmall`
+    min-width: 290px;
+    &:not(:last-of-type) {
+      margin-right: 20px;
+    }
+  `}
+
+  ${({ css }) => css && css}
+`
+
+export const PopupItemWrapper = styled.div`
+  ${(props) => props.className} {
+    border: 2px solid ${({ theme }) => theme.black};
+    box-shadow: 2px 2px 0 ${({ theme }) => theme.black};
+  }
+
+  ${PopupWrapper} {
+    ${({ theme }) => theme.mediaWidth.upToSmall`
+      margin: 0 0 16px;
+      min-width: 100%;
+    `}
+  }
+
+  ${Fader} {
+    background-color: ${({ theme }) => theme.disabled};
+    height: 4px;
+  }
+
+  a {
+    text-decoration: underline;
+    color: ${({ theme }) => theme.textLink};
+  }
+`
+
+export const StyledClose = styled(X)`
+  position: absolute;
+  right: 10px;
+  top: 10px;
+
+  :hover {
+    cursor: pointer;
+  }
+`
+
+export const AnimatedFader = animated(Fader)
diff --git a/src/legacy/components/Tokens/TokensTableRow.tsx b/src/legacy/components/Tokens/TokensTableRow.tsx
index d8519827d3..5c07a2671d 100644
--- a/src/legacy/components/Tokens/TokensTableRow.tsx
+++ b/src/legacy/components/Tokens/TokensTableRow.tsx
@@ -20,10 +20,10 @@ import { getBlockExplorerUrl } from 'legacy/utils'
 import { parameterizeTradeRoute } from 'modules/trade/utils/parameterizeTradeRoute'
 import { useWalletInfo } from 'modules/wallet'
 
+import { Routes } from 'common/constants/routes'
 import { useAreThereTokensWithSameSymbol } from 'common/hooks/useAreThereTokensWithSameSymbol'
 import { TokenAmount } from 'common/pure/TokenAmount'
 import { TokenSymbol } from 'common/pure/TokenSymbol'
-import { Routes } from 'constants/routes'
 import { CardsSpinner, ExtLink } from 'pages/Account/styled'
 
 import BalanceCell from './BalanceCell'
diff --git a/src/legacy/hooks/usePriceImpact/useFallbackPriceImpact.ts b/src/legacy/hooks/usePriceImpact/useFallbackPriceImpact.ts
index fae648f631..56a5264f91 100644
--- a/src/legacy/hooks/usePriceImpact/useFallbackPriceImpact.ts
+++ b/src/legacy/hooks/usePriceImpact/useFallbackPriceImpact.ts
@@ -8,7 +8,7 @@ import { QuoteInformationObject } from 'legacy/state/price/reducer'
 import { calculateFallbackPriceImpact } from 'legacy/utils/price'
 
 import { LegacyFeeQuoteParams } from 'api/gnosisProtocol/legacy/types'
-import { PRICE_QUOTE_VALID_TO_TIME } from 'constants/quote'
+import { PRICE_QUOTE_VALID_TO_TIME } from 'common/constants/quote'
 
 import { FallbackPriceImpactParams, PriceImpactTrade } from './types'
 import useExactInSwap, { useCalculateQuote } from './useQuoteAndSwap'
diff --git a/src/legacy/state/orders/middleware/appziMiddleware.test.ts b/src/legacy/state/orders/middleware/appziMiddleware.test.ts
index d7cee50434..aca3231a30 100644
--- a/src/legacy/state/orders/middleware/appziMiddleware.test.ts
+++ b/src/legacy/state/orders/middleware/appziMiddleware.test.ts
@@ -1,5 +1,4 @@
 import { OrderClass } from '@cowprotocol/cow-sdk'
-import { getOrderByIdFromState } from '../helpers'
 
 import { AnyAction, Dispatch, MiddlewareAPI } from 'redux'
 import { instance, mock, resetCalls, when } from 'ts-mockito'
@@ -9,6 +8,7 @@ import { isOrderInPendingTooLong, openNpsAppziSometimes } from 'legacy/utils/app
 import { appziMiddleware } from './appziMiddleware'
 
 import { AppState } from '../../index'
+import { getOrderByIdFromState } from '../helpers'
 
 jest.mock('legacy/utils/appzi')
 jest.mock('../helpers', () => {
diff --git a/src/legacy/state/orders/updaters/UnfillableOrdersUpdater.ts b/src/legacy/state/orders/updaters/UnfillableOrdersUpdater.ts
index aa708bb168..642adfd859 100644
--- a/src/legacy/state/orders/updaters/UnfillableOrdersUpdater.ts
+++ b/src/legacy/state/orders/updaters/UnfillableOrdersUpdater.ts
@@ -30,7 +30,7 @@ import { supportedChainId } from 'legacy/utils/supportedChainId'
 import { updatePendingOrderPricesAtom } from 'modules/orders/state/pendingOrdersPricesAtom'
 import { useWalletInfo } from 'modules/wallet'
 
-import { PRICE_QUOTE_VALID_TO_TIME } from 'constants/quote'
+import { PRICE_QUOTE_VALID_TO_TIME } from 'common/constants/quote'
 
 /**
  * Thin wrapper around `getBestPrice` that builds the params and returns null on failure
diff --git a/src/libs/ui-utils/.eslintrc.json b/src/libs/ui-utils/.eslintrc.json
new file mode 100644
index 0000000000..9a654cf03a
--- /dev/null
+++ b/src/libs/ui-utils/.eslintrc.json
@@ -0,0 +1,20 @@
+{
+  // TODO: Once we get rid of craco, cra
+  // "extends": ["plugin:@nx/react"],
+  "extends": ["../../../.eslintrc.json"],
+  "ignorePatterns": ["!**/*"],
+  "overrides": [
+    {
+      "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
+      "rules": {}
+    },
+    {
+      "files": ["*.ts", "*.tsx"],
+      "rules": {}
+    },
+    {
+      "files": ["*.js", "*.jsx"],
+      "rules": {}
+    }
+  ]
+}
diff --git a/src/libs/ui-utils/README.md b/src/libs/ui-utils/README.md
new file mode 100644
index 0000000000..b820e6bfdf
--- /dev/null
+++ b/src/libs/ui-utils/README.md
@@ -0,0 +1,11 @@
+# ui-utils
+
+This library was generated with [Nx](https://nx.dev).
+
+## Bui-utilslding
+
+Run `nx bui-utilsld ui-utils` to bui-utilsld the library.
+
+## Running unit tests
+
+Run `nx test ui-utils` to execute the unit tests via [Jest](https://jestjs.io).
diff --git a/src/libs/ui-utils/jest.config.ts b/src/libs/ui-utils/jest.config.ts
new file mode 100644
index 0000000000..d94436dab8
--- /dev/null
+++ b/src/libs/ui-utils/jest.config.ts
@@ -0,0 +1,10 @@
+/* eslint-disable */
+export default {
+  displayName: 'ui-utils',
+  preset: '../../../jest.preset.js',
+  transform: {
+    '^.+\\.[tj]s$': ['ts-jest', { tsconfig: '<rootDir>/tsconfig.spec.json' }],
+  },
+  moduleFileExtensions: ['ts', 'js', 'html'],
+  coverageDirectory: '../../../coverage/libs/ui-utils',
+}
diff --git a/src/libs/ui-utils/package.json b/src/libs/ui-utils/package.json
new file mode 100644
index 0000000000..c098259ef5
--- /dev/null
+++ b/src/libs/ui-utils/package.json
@@ -0,0 +1,5 @@
+{
+  "name": "@cowprotocol/ui-utils",
+  "version": "0.0.1",
+  "type": "commonjs"
+}
diff --git a/src/libs/ui-utils/project.json b/src/libs/ui-utils/project.json
new file mode 100644
index 0000000000..72c3785288
--- /dev/null
+++ b/src/libs/ui-utils/project.json
@@ -0,0 +1,41 @@
+{
+  "name": "ui-utils",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "src/libs/ui-utils/src",
+  "projectType": "library",
+  "targets": {
+    "build": {
+      "executor": "@nx/vite:build",
+      "outputs": ["{options.outputPath}"],
+      "options": {
+        "outputPath": "dist/libs/ui-utils"
+      }
+    },
+    "publish": {
+      "command": "node tools/scripts/publish.mjs ui {args.ver} {args.tag}",
+      "dependsOn": ["build"]
+    },
+    "lint": {
+      "executor": "@nx/linter:eslint",
+      "outputs": ["{options.outputFile}"],
+      "options": {
+        "lintFilePatterns": ["src/libs/ui-utils/**/*.ts"]
+      }
+    },
+    "test": {
+      "executor": "@nx/jest:jest",
+      "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
+      "options": {
+        "jestConfig": "src/libs/ui-utils/jest.config.ts",
+        "passWithNoTests": true
+      },
+      "configurations": {
+        "ci": {
+          "ci": true,
+          "codeCoverage": true
+        }
+      }
+    }
+  },
+  "tags": []
+}
diff --git a/src/libs/ui-utils/src/index.ts b/src/libs/ui-utils/src/index.ts
new file mode 100644
index 0000000000..800f1d6d63
--- /dev/null
+++ b/src/libs/ui-utils/src/index.ts
@@ -0,0 +1 @@
+export * from './lib/return5'
diff --git a/src/libs/ui-utils/src/lib/return5.spec.ts b/src/libs/ui-utils/src/lib/return5.spec.ts
new file mode 100644
index 0000000000..9c757e558c
--- /dev/null
+++ b/src/libs/ui-utils/src/lib/return5.spec.ts
@@ -0,0 +1,7 @@
+import { return5 } from './return5'
+
+describe('return5', () => {
+  it('should work', () => {
+    expect(return5()).toEqual(5)
+  })
+})
diff --git a/src/libs/ui-utils/src/lib/return5.ts b/src/libs/ui-utils/src/lib/return5.ts
new file mode 100644
index 0000000000..69fec1c1e9
--- /dev/null
+++ b/src/libs/ui-utils/src/lib/return5.ts
@@ -0,0 +1,3 @@
+export function return5(): number {
+  return 5
+}
diff --git a/src/libs/ui-utils/tsconfig.json b/src/libs/ui-utils/tsconfig.json
new file mode 100644
index 0000000000..8122543a9a
--- /dev/null
+++ b/src/libs/ui-utils/tsconfig.json
@@ -0,0 +1,22 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "compilerOptions": {
+    "module": "commonjs",
+    "forceConsistentCasingInFileNames": true,
+    "strict": true,
+    "noImplicitOverride": true,
+    "noPropertyAccessFromIndexSignature": true,
+    "noImplicitReturns": true,
+    "noFallthroughCasesInSwitch": true
+  },
+  "files": [],
+  "include": [],
+  "references": [
+    {
+      "path": "./tsconfig.lib.json"
+    },
+    {
+      "path": "./tsconfig.spec.json"
+    }
+  ]
+}
diff --git a/src/libs/ui-utils/tsconfig.lib.json b/src/libs/ui-utils/tsconfig.lib.json
new file mode 100644
index 0000000000..4befa7f099
--- /dev/null
+++ b/src/libs/ui-utils/tsconfig.lib.json
@@ -0,0 +1,10 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../../dist/out-tsc",
+    "declaration": true,
+    "types": ["node"]
+  },
+  "include": ["src/**/*.ts"],
+  "exclude": ["jest.config.ts", "src/**/*.spec.ts", "src/**/*.test.ts"]
+}
diff --git a/src/libs/ui-utils/tsconfig.spec.json b/src/libs/ui-utils/tsconfig.spec.json
new file mode 100644
index 0000000000..b2ee74a6b1
--- /dev/null
+++ b/src/libs/ui-utils/tsconfig.spec.json
@@ -0,0 +1,9 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../../dist/out-tsc",
+    "module": "commonjs",
+    "types": ["jest", "node"]
+  },
+  "include": ["jest.config.ts", "src/**/*.test.ts", "src/**/*.spec.ts", "src/**/*.d.ts"]
+}
diff --git a/src/libs/ui-utils/vite.config.ts b/src/libs/ui-utils/vite.config.ts
new file mode 100644
index 0000000000..0e148279f6
--- /dev/null
+++ b/src/libs/ui-utils/vite.config.ts
@@ -0,0 +1,48 @@
+/// <reference types="vitest" />
+import { joinPathFragments } from '@nx/devkit'
+import { defineConfig } from 'vite'
+import dts from 'vite-plugin-dts'
+import viteTsConfigPaths from 'vite-tsconfig-paths'
+
+export default defineConfig({
+  cacheDir: '../../../node_modules/.vite/ui',
+
+  plugins: [
+    dts({
+      entryRoot: 'src',
+      tsConfigFilePath: joinPathFragments(__dirname, 'tsconfig.lib.json'),
+      skipDiagnostics: true,
+    }),
+
+    viteTsConfigPaths({
+      root: '../../../',
+    }),
+  ],
+
+  // Uncomment this if you are using workers.
+  // worker: {
+  //  plugins: [
+  //    viteTsConfigPaths({
+  //      root: '../../../',
+  //    }),
+  //  ],
+  // },
+
+  // Configuration for building your library.
+  // See: https://vitejs.dev/guide/build.html#library-mode
+  build: {
+    lib: {
+      // Could also be a dictionary or array of multiple entry points.
+      entry: 'src/index.ts',
+      name: 'ui',
+      fileName: 'index',
+      // Change this to the formats you want to support.
+      // Don't forgot to update your package.json as well.
+      formats: ['es', 'cjs'],
+    },
+    rollupOptions: {
+      // External packages that should not be bundled into your library.
+      external: [],
+    },
+  },
+})
diff --git a/src/libs/ui/.eslintrc.json b/src/libs/ui/.eslintrc.json
new file mode 100644
index 0000000000..9a654cf03a
--- /dev/null
+++ b/src/libs/ui/.eslintrc.json
@@ -0,0 +1,20 @@
+{
+  // TODO: Once we get rid of craco, cra
+  // "extends": ["plugin:@nx/react"],
+  "extends": ["../../../.eslintrc.json"],
+  "ignorePatterns": ["!**/*"],
+  "overrides": [
+    {
+      "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
+      "rules": {}
+    },
+    {
+      "files": ["*.ts", "*.tsx"],
+      "rules": {}
+    },
+    {
+      "files": ["*.js", "*.jsx"],
+      "rules": {}
+    }
+  ]
+}
diff --git a/src/libs/ui/README.md b/src/libs/ui/README.md
new file mode 100644
index 0000000000..d01cabf1f9
--- /dev/null
+++ b/src/libs/ui/README.md
@@ -0,0 +1,7 @@
+# ui
+
+This library was generated with [Nx](https://nx.dev).
+
+## Running unit tests
+
+Run `nx test ui` to execute the unit tests via [Vitest](https://vitest.dev/).
diff --git a/src/libs/ui/jest.config.ts b/src/libs/ui/jest.config.ts
new file mode 100644
index 0000000000..18a8fadfc5
--- /dev/null
+++ b/src/libs/ui/jest.config.ts
@@ -0,0 +1,11 @@
+/* eslint-disable */
+export default {
+  displayName: 'ui',
+  preset: '../../../jest.preset.js',
+  transform: {
+    '^(?!.*\\.(js|jsx|ts|tsx|css|json)$)': '@nx/react/plugins/jest',
+    '^.+\\.[tj]sx?$': ['babel-jest', { presets: ['@nx/react/babel'] }],
+  },
+  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
+  coverageDirectory: '../../../coverage/libs/ui',
+}
diff --git a/src/libs/ui/package.json b/src/libs/ui/package.json
new file mode 100644
index 0000000000..3201535ecf
--- /dev/null
+++ b/src/libs/ui/package.json
@@ -0,0 +1,12 @@
+{
+  "name": "@cowprotocol/ui",
+  "version": "0.0.1",
+  "main": "./index.js",
+  "types": "./index.d.ts",
+  "exports": {
+    ".": {
+      "import": "./index.mjs",
+      "require": "./index.js"
+    }
+  }
+}
diff --git a/src/libs/ui/project.json b/src/libs/ui/project.json
new file mode 100644
index 0000000000..dae99e4a2a
--- /dev/null
+++ b/src/libs/ui/project.json
@@ -0,0 +1,46 @@
+{
+  "name": "ui",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "src/libs/ui/src",
+  "projectType": "library",
+  "tags": [],
+  "targets": {
+    "lint": {
+      "executor": "@nx/linter:eslint",
+      "outputs": ["{options.outputFile}"],
+      "options": {
+        "lintFilePatterns": ["src/libs/ui/**/*.{ts,tsx,js,jsx}"]
+      }
+    },
+    "build": {
+      "executor": "@nx/vite:build",
+      "outputs": ["{options.outputPath}"],
+      "defaultConfiguration": "production",
+      "options": {
+        "outputPath": "dist/libs/ui"
+      },
+      "configurations": {
+        "development": {
+          "mode": "development"
+        },
+        "production": {
+          "mode": "production"
+        }
+      }
+    },
+    "test": {
+      "executor": "@nx/jest:jest",
+      "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
+      "options": {
+        "jestConfig": "src/libs/ui/jest.config.ts",
+        "passWithNoTests": true
+      },
+      "configurations": {
+        "ci": {
+          "ci": true,
+          "codeCoverage": true
+        }
+      }
+    }
+  }
+}
diff --git a/src/libs/ui/src/index.ts b/src/libs/ui/src/index.ts
new file mode 100644
index 0000000000..c8ce325a11
--- /dev/null
+++ b/src/libs/ui/src/index.ts
@@ -0,0 +1 @@
+export * from './lib/ui'
diff --git a/src/libs/ui/src/lib/ui.spec.tsx b/src/libs/ui/src/lib/ui.spec.tsx
new file mode 100644
index 0000000000..a5690cf131
--- /dev/null
+++ b/src/libs/ui/src/lib/ui.spec.tsx
@@ -0,0 +1,10 @@
+import { render } from '@testing-library/react'
+
+import { PinkTitle } from './ui'
+
+describe('Ui', () => {
+  it('should render successfully', () => {
+    const { baseElement } = render(<PinkTitle />)
+    expect(baseElement).toBeTruthy()
+  })
+})
diff --git a/src/libs/ui/src/lib/ui.tsx b/src/libs/ui/src/lib/ui.tsx
new file mode 100644
index 0000000000..d38956cdf2
--- /dev/null
+++ b/src/libs/ui/src/lib/ui.tsx
@@ -0,0 +1,16 @@
+import { PropsWithChildren } from 'react'
+
+import { return5 } from '@cowprotocol/ui-utils'
+
+/* eslint-disable-next-line */
+export interface UiProps extends PropsWithChildren {}
+
+export function PinkTitle(props: UiProps) {
+  return (
+    <div style={{ border: '1px solid pink', height: '150px', width: '100%' }}>
+      <h1 style={{ color: 'pink' }}>
+        {props.children} (return5 = {return5()})
+      </h1>
+    </div>
+  )
+}
diff --git a/src/libs/ui/tsconfig.json b/src/libs/ui/tsconfig.json
new file mode 100644
index 0000000000..acc38d499c
--- /dev/null
+++ b/src/libs/ui/tsconfig.json
@@ -0,0 +1,21 @@
+{
+  "compilerOptions": {
+    "jsx": "react-jsx",
+    "allowJs": false,
+    "esModuleInterop": false,
+    "allowSyntheticDefaultImports": true,
+    "strict": true,
+    "types": ["vite/client"]
+  },
+  "files": [],
+  "include": [],
+  "references": [
+    {
+      "path": "./tsconfig.lib.json"
+    },
+    {
+      "path": "./tsconfig.spec.json"
+    }
+  ],
+  "extends": "../../../tsconfig.base.json"
+}
diff --git a/src/libs/ui/tsconfig.lib.json b/src/libs/ui/tsconfig.lib.json
new file mode 100644
index 0000000000..34489e9d3f
--- /dev/null
+++ b/src/libs/ui/tsconfig.lib.json
@@ -0,0 +1,23 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../../dist/out-tsc",
+    "types": ["node", "vite/client"]
+  },
+  "files": [
+    "../../../node_modules/@nx/react/typings/styled-jsx.d.ts",
+    "../../../node_modules/@nx/react/typings/cssmodule.d.ts",
+    "../../../node_modules/@nx/react/typings/image.d.ts"
+  ],
+  "exclude": [
+    "**/*.spec.ts",
+    "**/*.test.ts",
+    "**/*.spec.tsx",
+    "**/*.test.tsx",
+    "**/*.spec.js",
+    "**/*.test.js",
+    "**/*.spec.jsx",
+    "**/*.test.jsx"
+  ],
+  "include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"]
+}
diff --git a/src/libs/ui/tsconfig.spec.json b/src/libs/ui/tsconfig.spec.json
new file mode 100644
index 0000000000..25b7af8f6d
--- /dev/null
+++ b/src/libs/ui/tsconfig.spec.json
@@ -0,0 +1,20 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../../dist/out-tsc",
+    "module": "commonjs",
+    "types": ["jest", "node"]
+  },
+  "include": [
+    "jest.config.ts",
+    "src/**/*.test.ts",
+    "src/**/*.spec.ts",
+    "src/**/*.test.tsx",
+    "src/**/*.spec.tsx",
+    "src/**/*.test.js",
+    "src/**/*.spec.js",
+    "src/**/*.test.jsx",
+    "src/**/*.spec.jsx",
+    "src/**/*.d.ts"
+  ]
+}
diff --git a/src/libs/ui/vite.config.ts b/src/libs/ui/vite.config.ts
new file mode 100644
index 0000000000..8f939a4cb4
--- /dev/null
+++ b/src/libs/ui/vite.config.ts
@@ -0,0 +1,49 @@
+/// <reference types="vitest" />
+import { joinPathFragments } from '@nx/devkit'
+import react from '@vitejs/plugin-react'
+import { defineConfig } from 'vite'
+import dts from 'vite-plugin-dts'
+import viteTsConfigPaths from 'vite-tsconfig-paths'
+
+export default defineConfig({
+  cacheDir: '../../../node_modules/.vite/ui',
+
+  plugins: [
+    dts({
+      entryRoot: 'src',
+      tsConfigFilePath: joinPathFragments(__dirname, 'tsconfig.lib.json'),
+      skipDiagnostics: true,
+    }),
+    react(),
+    viteTsConfigPaths({
+      root: '../../../',
+    }),
+  ],
+
+  // Uncomment this if you are using workers.
+  // worker: {
+  //  plugins: [
+  //    viteTsConfigPaths({
+  //      root: '../../../',
+  //    }),
+  //  ],
+  // },
+
+  // Configuration for building your library.
+  // See: https://vitejs.dev/guide/build.html#library-mode
+  build: {
+    lib: {
+      // Could also be a dictionary or array of multiple entry points.
+      entry: 'src/index.ts',
+      name: 'ui',
+      fileName: 'index',
+      // Change this to the formats you want to support.
+      // Don't forgot to update your package.json as well.
+      formats: ['es', 'cjs'],
+    },
+    rollupOptions: {
+      // External packages that should not be bundled into your library.
+      external: ['react', 'react-dom', 'react/jsx-runtime'],
+    },
+  },
+})
diff --git a/src/modules/application/containers/App/RoutesApp.tsx b/src/modules/application/containers/App/RoutesApp.tsx
index 91ef2c4ecd..3182aa6f1a 100644
--- a/src/modules/application/containers/App/RoutesApp.tsx
+++ b/src/modules/application/containers/App/RoutesApp.tsx
@@ -8,7 +8,7 @@ import Loader from 'legacy/components/Loader'
 import { DISCORD_LINK, DOCS_LINK, DUNE_DASHBOARD_LINK, TWITTER_LINK } from 'legacy/constants'
 import { RedirectPathToSwapOnly } from 'legacy/pages/Swap/redirects'
 
-import { Routes as RoutesEnum } from 'constants/routes'
+import { Routes as RoutesEnum } from 'common/constants/routes'
 import Account, { AccountOverview } from 'pages/Account'
 import AnySwapAffectedUsers from 'pages/error/AnySwapAffectedUsers'
 import { SwapPage } from 'pages/Swap'
@@ -36,6 +36,8 @@ const EthFlowFaq = lazy(() => import(/* webpackChunkName: "eth_flow_faq" */ 'pag
 const AccountTokensOverview = lazy(() => import(/* webpackChunkName: "tokens_overview" */ 'pages/Account/Tokens'))
 const AccountNotFound = lazy(() => import(/* webpackChunkName: "affiliate" */ 'pages/error/NotFound'))
 
+const KitchenSink = lazy(() => import(/* webpackChunkName: "kitchen_sink" */ 'pages/KitchenSink'))
+
 function createRedirectExternal(url: string) {
   return () => {
     window.location.replace(url)
@@ -64,6 +66,7 @@ const lazyRoutes: LazyRouteProps[] = [
   { route: RoutesEnum.PRIVACY_POLICY, element: <PrivacyPolicy /> },
   { route: RoutesEnum.COOKIE_POLICY, element: <CookiePolicy /> },
   { route: RoutesEnum.TERMS_CONDITIONS, element: <TermsAndConditions /> },
+  { route: RoutesEnum.KITCHEN_SINK, element: <KitchenSink /> },
 ]
 
 export function RoutesApp() {
diff --git a/src/modules/application/containers/TradeWidgetLinks/index.tsx b/src/modules/application/containers/TradeWidgetLinks/index.tsx
index 8e895d31d6..df22701ccc 100644
--- a/src/modules/application/containers/TradeWidgetLinks/index.tsx
+++ b/src/modules/application/containers/TradeWidgetLinks/index.tsx
@@ -3,8 +3,8 @@ import { Trans } from '@lingui/macro'
 import { useTradeRouteContext } from 'modules/trade/hooks/useTradeRouteContext'
 import { parameterizeTradeRoute } from 'modules/trade/utils/parameterizeTradeRoute'
 
+import { Routes } from 'common/constants/routes'
 import { FeatureGuard } from 'common/containers/FeatureGuard'
-import { Routes } from 'constants/routes'
 
 import * as styledEl from './styled'
 
diff --git a/src/modules/application/containers/WithLDProvider.tsx b/src/modules/application/containers/WithLDProvider.tsx
index 2ad7136131..3b54994308 100644
--- a/src/modules/application/containers/WithLDProvider.tsx
+++ b/src/modules/application/containers/WithLDProvider.tsx
@@ -2,7 +2,7 @@ import { PropsWithChildren } from 'react'
 
 import { withLDProvider } from 'launchdarkly-react-client-sdk'
 
-import { LAUNCH_DARKLY_CLIENT_KEY } from 'constants/launchDarkly'
+import { LAUNCH_DARKLY_CLIENT_KEY } from 'common/constants/launchDarkly'
 
 function InnerWithLDProvider({ children }: PropsWithChildren) {
   return <>{children}</>
diff --git a/src/modules/limitOrders/containers/LimitOrdersWarnings/index.tsx b/src/modules/limitOrders/containers/LimitOrdersWarnings/index.tsx
index 4729b9a17c..8900a57bbb 100644
--- a/src/modules/limitOrders/containers/LimitOrdersWarnings/index.tsx
+++ b/src/modules/limitOrders/containers/LimitOrdersWarnings/index.tsx
@@ -22,6 +22,7 @@ import { TradeFormValidation, useGetTradeFormValidation } from 'modules/tradeFor
 import { useTradeQuote } from 'modules/tradeQuote'
 import { useIsSafeViaWc, useWalletInfo } from 'modules/wallet'
 
+import { HIGH_FEE_WARNING_PERCENTAGE } from 'common/constants/common'
 import { useShouldZeroApprove } from 'common/hooks/useShouldZeroApprove'
 import {
   BundleTxApprovalBanner,
@@ -29,7 +30,6 @@ import {
   SmallVolumeWarningBanner,
 } from 'common/pure/InlineBanner/banners'
 import { ZeroApprovalWarning } from 'common/pure/ZeroApprovalWarning'
-import { HIGH_FEE_WARNING_PERCENTAGE } from 'constants/common'
 import { isFractionFalsy } from 'utils/isFractionFalsy'
 import { calculatePercentageInRelationToReference } from 'utils/orderUtils/calculatePercentageInRelationToReference'
 
diff --git a/src/modules/limitOrders/containers/RateInput/index.tsx b/src/modules/limitOrders/containers/RateInput/index.tsx
index 9d0167b955..4689c0043d 100644
--- a/src/modules/limitOrders/containers/RateInput/index.tsx
+++ b/src/modules/limitOrders/containers/RateInput/index.tsx
@@ -16,10 +16,10 @@ import { limitRateAtom, updateLimitRateAtom } from 'modules/limitOrders/state/li
 import { toFraction } from 'modules/limitOrders/utils/toFraction'
 import { useWalletInfo } from 'modules/wallet'
 
+import { ordersTableFeatures } from 'common/constants/featureFlags'
 import { ExecutionPrice } from 'common/pure/ExecutionPrice'
 import { TokenSymbol } from 'common/pure/TokenSymbol'
 import { getQuoteCurrency, getQuoteCurrencyByStableCoin } from 'common/services/getQuoteCurrency'
-import { ordersTableFeatures } from 'constants/featureFlags'
 import { formatInputAmount } from 'utils/amountFormat'
 import { getAddress } from 'utils/getAddress'
 import { isFractionFalsy } from 'utils/isFractionFalsy'
diff --git a/src/modules/limitOrders/pure/LimitOrdersDetails/index.tsx b/src/modules/limitOrders/pure/LimitOrdersDetails/index.tsx
index 02ad06168f..b08b94b6ef 100644
--- a/src/modules/limitOrders/pure/LimitOrdersDetails/index.tsx
+++ b/src/modules/limitOrders/pure/LimitOrdersDetails/index.tsx
@@ -18,10 +18,10 @@ import { LimitRateState } from 'modules/limitOrders/state/limitRateAtom'
 import { PartiallyFillableOverrideDispatcherType } from 'modules/limitOrders/state/partiallyFillableOverride'
 import { calculateLimitOrdersDeadline } from 'modules/limitOrders/utils/calculateLimitOrdersDeadline'
 
+import { ordersTableFeatures } from 'common/constants/featureFlags'
+import { DEFAULT_DATE_FORMAT } from 'common/constants/intl'
 import { ExecutionPrice } from 'common/pure/ExecutionPrice'
 import { RateInfoParams } from 'common/pure/RateInfo'
-import { ordersTableFeatures } from 'constants/featureFlags'
-import { DEFAULT_DATE_FORMAT } from 'constants/intl'
 import { formatInputAmount } from 'utils/amountFormat'
 
 import * as styledEl from './styled'
diff --git a/src/modules/mainMenu/constants/mainMenu.ts b/src/modules/mainMenu/constants/mainMenu.ts
index 96756960b6..3d4b8ad83d 100644
--- a/src/modules/mainMenu/constants/mainMenu.ts
+++ b/src/modules/mainMenu/constants/mainMenu.ts
@@ -11,7 +11,7 @@ import IMAGE_TERMS_AND_CONDITIONS from 'legacy/assets/cow-swap/terms-and-conditi
 import IMAGE_TWITTER from 'legacy/assets/cow-swap/twitter.svg'
 import { CONTRACTS_CODE_LINK, DISCORD_LINK, DOCS_LINK, DUNE_DASHBOARD_LINK, TWITTER_LINK } from 'legacy/constants'
 
-import { Routes } from 'constants/routes'
+import { Routes } from 'common/constants/routes'
 
 import { BasicMenuLink, InternalLink, MainMenuItemId, MenuItemKind, MenuTreeItem } from '../types'
 
diff --git a/src/modules/mainMenu/pure/MenuTree/index.tsx b/src/modules/mainMenu/pure/MenuTree/index.tsx
index 9eb31e6a06..e264d44cd8 100644
--- a/src/modules/mainMenu/pure/MenuTree/index.tsx
+++ b/src/modules/mainMenu/pure/MenuTree/index.tsx
@@ -19,7 +19,7 @@ import {
 } from 'modules/mainMenu/types'
 import { parameterizeTradeRoute } from 'modules/trade/utils/parameterizeTradeRoute'
 
-import { Routes } from 'constants/routes'
+import { Routes } from 'common/constants/routes'
 
 // Assets
 
diff --git a/src/modules/mainMenu/types.ts b/src/modules/mainMenu/types.ts
index 918f44af74..156145fb70 100644
--- a/src/modules/mainMenu/types.ts
+++ b/src/modules/mainMenu/types.ts
@@ -1,6 +1,6 @@
 import { TradeUrlParams } from 'modules/trade/types/TradeRawState'
 
-import { Routes } from 'constants/routes'
+import { Routes } from 'common/constants/routes'
 
 export enum MenuItemKind {
   DROP_DOWN = 'DROP_DOWN',
diff --git a/src/modules/mainMenu/utils.ts b/src/modules/mainMenu/utils.ts
index 7835aa5120..a0eba0c536 100644
--- a/src/modules/mainMenu/utils.ts
+++ b/src/modules/mainMenu/utils.ts
@@ -3,7 +3,7 @@ import cloneDeep from 'clone-deep'
 import { MAIN_MENU } from './constants/mainMenu'
 import { DropDownItem, MainMenuItemId, MenuItemKind, MenuTreeItem } from './types'
 
-import { Routes } from '../../constants/routes'
+import { Routes } from '../../common/constants/routes'
 
 const ADVANCED_ORDERS_MENU_TITLE = 'Advanced orders'
 
diff --git a/src/modules/ordersTable/pure/OrdersTableContainer/OrderRow/EstimatedExecutionPrice.tsx b/src/modules/ordersTable/pure/OrdersTableContainer/OrderRow/EstimatedExecutionPrice.tsx
index b0f063df51..01d725a782 100644
--- a/src/modules/ordersTable/pure/OrdersTableContainer/OrderRow/EstimatedExecutionPrice.tsx
+++ b/src/modules/ordersTable/pure/OrdersTableContainer/OrderRow/EstimatedExecutionPrice.tsx
@@ -10,9 +10,9 @@ import AlertTriangle from 'legacy/assets/cow-swap/alert.svg'
 import { MouseoverTooltipContent } from 'legacy/components/Tooltip'
 import { ZERO_FRACTION } from 'legacy/constants'
 
+import { HIGH_FEE_WARNING_PERCENTAGE } from 'common/constants/common'
 import { calculateOrderExecutionStatus, ExecuteIndicator } from 'common/pure/OrderExecutionStatusList'
 import { SymbolElement, TokenAmount, TokenAmountProps } from 'common/pure/TokenAmount'
-import { HIGH_FEE_WARNING_PERCENTAGE } from 'constants/common'
 
 import * as styledEl from './styled'
 
diff --git a/src/modules/ordersTable/pure/OrdersTableContainer/OrdersTable.tsx b/src/modules/ordersTable/pure/OrdersTableContainer/OrdersTable.tsx
index fca133bd5b..2f2e176587 100644
--- a/src/modules/ordersTable/pure/OrdersTableContainer/OrdersTable.tsx
+++ b/src/modules/ordersTable/pure/OrdersTableContainer/OrdersTable.tsx
@@ -25,11 +25,11 @@ import {
 import { LimitOrderActions } from 'modules/ordersTable/pure/OrdersTableContainer/types'
 import { BalancesAndAllowances } from 'modules/tokens'
 
+import { ordersTableFeatures } from 'common/constants/featureFlags'
 import { OrderExecutionStatusList, RateTooltipHeader } from 'common/pure/OrderExecutionStatusList'
 import { InvertRateControl } from 'common/pure/RateInfo'
 import { CancellableOrder } from 'common/utils/isOrderCancellable'
 import { isOrderOffChainCancellable } from 'common/utils/isOrderOffChainCancellable'
-import { ordersTableFeatures } from 'constants/featureFlags'
 import { ordersSorter } from 'utils/orderUtils/ordersSorter'
 import { ParsedOrder } from 'utils/orderUtils/parseOrder'
 
diff --git a/src/modules/trade/hooks/useTradeTypeInfo.ts b/src/modules/trade/hooks/useTradeTypeInfo.ts
index 766e99dff8..f921e48661 100644
--- a/src/modules/trade/hooks/useTradeTypeInfo.ts
+++ b/src/modules/trade/hooks/useTradeTypeInfo.ts
@@ -3,7 +3,7 @@ import { useMemo } from 'react'
 import { PathMatch } from '@remix-run/router'
 import { useMatch } from 'react-router-dom'
 
-import { Routes } from 'constants/routes'
+import { Routes } from 'common/constants/routes'
 
 export enum TradeType {
   SWAP,
diff --git a/src/modules/trade/utils/parameterizeTradeRoute.ts b/src/modules/trade/utils/parameterizeTradeRoute.ts
index 13d6786e32..c9fda931ba 100644
--- a/src/modules/trade/utils/parameterizeTradeRoute.ts
+++ b/src/modules/trade/utils/parameterizeTradeRoute.ts
@@ -1,6 +1,6 @@
 import { TradeUrlParams } from 'modules/trade/types/TradeRawState'
 
-import { Routes } from 'constants/routes'
+import { Routes } from 'common/constants/routes'
 
 /**
  * When input currency is not set and user select output currency, we build a link like:
diff --git a/src/modules/wallet/api/pure/WalletModal/index.tsx b/src/modules/wallet/api/pure/WalletModal/index.tsx
index 8f92f851c9..a62e7897c3 100644
--- a/src/modules/wallet/api/pure/WalletModal/index.tsx
+++ b/src/modules/wallet/api/pure/WalletModal/index.tsx
@@ -12,9 +12,9 @@ import { PendingView } from 'modules/wallet/api/pure/PendingView'
 import { ZengoBanner } from 'modules/wallet/api/pure/ZengoBanner'
 import { ConnectWalletOptions, TryActivation } from 'modules/wallet/web3-react/connection'
 
+import { Routes } from 'common/constants/routes'
 import { GpModal } from 'common/pure/Modal'
 import { HeaderRow, HoverText, CloseIcon, ContentWrapper } from 'common/pure/Modal'
-import { Routes } from 'constants/routes'
 
 import { CloseColor, OptionGrid, TermsWrapper, UpperSection, Wrapper } from './styled'
 
diff --git a/src/pages/About/index.tsx b/src/pages/About/index.tsx
index 56d793adb7..0cca13a89f 100644
--- a/src/pages/About/index.tsx
+++ b/src/pages/About/index.tsx
@@ -13,7 +13,7 @@ import { ExternalLink as ExternalLinkTheme } from 'legacy/theme'
 import { PageTitle } from 'modules/application/containers/PageTitle'
 import { Page, Title, Content, GdocsListStyle } from 'modules/application/pure/Page'
 
-import { Routes } from 'constants/routes'
+import { Routes } from 'common/constants/routes'
 
 const ExternalLink = styled(ExternalLinkTheme)``
 
diff --git a/src/pages/Account/index.tsx b/src/pages/Account/index.tsx
index 2c94ca0de0..645d6d2c90 100644
--- a/src/pages/Account/index.tsx
+++ b/src/pages/Account/index.tsx
@@ -9,7 +9,7 @@ import { Loading } from 'legacy/components/FlashingLoading'
 import { PageTitle } from 'modules/application/containers/PageTitle'
 import { Content, Title } from 'modules/application/pure/Page'
 
-import { Routes as RoutesEnum } from 'constants/routes'
+import { Routes as RoutesEnum } from 'common/constants/routes'
 
 import { AccountMenu } from './Menu'
 import { Container, CardsWrapper } from './styled'
diff --git a/src/pages/AdvancedOrders/index.tsx b/src/pages/AdvancedOrders/index.tsx
index a44807628b..6ac7580fdd 100644
--- a/src/pages/AdvancedOrders/index.tsx
+++ b/src/pages/AdvancedOrders/index.tsx
@@ -8,8 +8,8 @@ import { parameterizeTradeRoute } from 'modules/trade/utils/parameterizeTradeRou
 import { TradeFormValidationUpdater } from 'modules/tradeFormValidation'
 import { TwapFormWidget } from 'modules/twap'
 
+import { Routes as RoutesEnum } from 'common/constants/routes'
 import { useIsAdvancedOrdersEnabled } from 'common/hooks/useIsAdvancedOrdersEnabled'
-import { Routes as RoutesEnum } from 'constants/routes'
 
 export default function AdvancedOrdersPage() {
   const isAdvancedOrdersEnabled = useIsAdvancedOrdersEnabled()
diff --git a/src/pages/Claim/ClaimingStatus.tsx b/src/pages/Claim/ClaimingStatus.tsx
index 75aca4928a..c0a2af03bc 100644
--- a/src/pages/Claim/ClaimingStatus.tsx
+++ b/src/pages/Claim/ClaimingStatus.tsx
@@ -24,8 +24,8 @@ import { shortenAddress } from 'legacy/utils'
 import { useWalletInfo } from 'modules/wallet'
 import AddToMetamask from 'modules/wallet/web3-react/containers/AddToMetamask'
 
+import { Routes } from 'common/constants/routes'
 import { TokenAmount } from 'common/pure/TokenAmount'
-import { Routes } from 'constants/routes'
 import {
   ConfirmOrLoadingWrapper,
   ConfirmedIcon,
diff --git a/src/pages/Faq/AffiliateFaq.tsx b/src/pages/Faq/AffiliateFaq.tsx
index 48fc3983b9..e184ace30c 100644
--- a/src/pages/Faq/AffiliateFaq.tsx
+++ b/src/pages/Faq/AffiliateFaq.tsx
@@ -8,7 +8,7 @@ import { BARN_URL, PRODUCTION_URL } from 'legacy/constants'
 import { PageTitle } from 'modules/application/containers/PageTitle'
 import { Page, Content } from 'modules/application/pure/Page'
 
-import { Routes } from 'constants/routes'
+import { Routes } from 'common/constants/routes'
 
 import { useToC } from './hooks'
 import { FaqMenu } from './Menu'
diff --git a/src/pages/Faq/TokenFaq.tsx b/src/pages/Faq/TokenFaq.tsx
index 3483d33a59..9635586998 100644
--- a/src/pages/Faq/TokenFaq.tsx
+++ b/src/pages/Faq/TokenFaq.tsx
@@ -6,7 +6,7 @@ import { Trace } from 'legacy/components/AmplitudeAnalytics/Trace'
 import { PageTitle } from 'modules/application/containers/PageTitle'
 import { Page, Content } from 'modules/application/pure/Page'
 
-import { Routes } from 'constants/routes'
+import { Routes } from 'common/constants/routes'
 
 import { useToC } from './hooks'
 import { FaqMenu } from './Menu'
diff --git a/src/pages/Faq/index.tsx b/src/pages/Faq/index.tsx
index 6d6b3f5da5..28636aeda1 100644
--- a/src/pages/Faq/index.tsx
+++ b/src/pages/Faq/index.tsx
@@ -16,7 +16,7 @@ import { StyledInternalLink } from 'legacy/theme'
 import { PageTitle } from 'modules/application/containers/PageTitle'
 import { Page, Content } from 'modules/application/pure/Page'
 
-import { Routes } from 'constants/routes'
+import { Routes } from 'common/constants/routes'
 
 import { useToC } from './hooks'
 import { FaqMenu } from './Menu'
diff --git a/src/pages/KitchenSink/index.tsx b/src/pages/KitchenSink/index.tsx
new file mode 100644
index 0000000000..d5ffd16513
--- /dev/null
+++ b/src/pages/KitchenSink/index.tsx
@@ -0,0 +1,18 @@
+import { PinkTitle } from '@cowprotocol/ui'
+
+import styled from 'styled-components/macro'
+
+import { Page, Title, Content } from 'modules/application/pure/Page'
+
+const Wrapper = styled(Page)``
+
+export default function KitchenSink() {
+  return (
+    <Wrapper>
+      <Title>Kitchen Sink</Title>
+      <Content>
+        <PinkTitle>pink title</PinkTitle>
+      </Content>
+    </Wrapper>
+  )
+}
diff --git a/src/pages/Swap/index.tsx b/src/pages/Swap/index.tsx
index 4849f45eb7..8b546caf99 100644
--- a/src/pages/Swap/index.tsx
+++ b/src/pages/Swap/index.tsx
@@ -9,7 +9,7 @@ import { getDefaultTradeRawState } from 'modules/trade/types/TradeRawState'
 import { parameterizeTradeRoute } from 'modules/trade/utils/parameterizeTradeRoute'
 import { useWalletInfo } from 'modules/wallet'
 
-import { Routes } from 'constants/routes'
+import { Routes } from 'common/constants/routes'
 
 export function SwapPage() {
   const params = useParams()
diff --git a/src/utils/amountFormat/index.ts b/src/utils/amountFormat/index.ts
index 519efe0e84..f9b1921f3f 100644
--- a/src/utils/amountFormat/index.ts
+++ b/src/utils/amountFormat/index.ts
@@ -6,7 +6,7 @@ import { FractionLike, Nullish } from 'types'
 import { AMOUNT_PRECISION, FIAT_PRECISION, PERCENTAGE_PRECISION, ZERO_FRACTION } from 'legacy/constants'
 import { maxAmountSpend } from 'legacy/utils/maxAmountSpend'
 
-import { INTL_NUMBER_FORMAT } from 'constants/intl'
+import { INTL_NUMBER_FORMAT } from 'common/constants/intl'
 import { FractionUtils } from 'utils/fractionUtils'
 import { trimTrailingZeros } from 'utils/trimTrailingZeros'
 
diff --git a/tools/scripts/publish.mjs b/tools/scripts/publish.mjs
new file mode 100644
index 0000000000..e82a097be2
--- /dev/null
+++ b/tools/scripts/publish.mjs
@@ -0,0 +1,58 @@
+/**
+ * This is a minimal script to publish your package to "npm".
+ * This is meant to be used as-is or customize as you see fit.
+ *
+ * This script is executed on "dist/path/to/library" as "cwd" by default.
+ *
+ * You might need to authenticate with NPM before running this script.
+ */
+
+import { execSync } from 'child_process'
+import { readFileSync, writeFileSync } from 'fs'
+import chalk from 'chalk'
+
+import devkit from '@nx/devkit'
+const { readCachedProjectGraph } = devkit
+
+function invariant(condition, message) {
+  if (!condition) {
+    console.error(chalk.bold.red(message))
+    process.exit(1)
+  }
+}
+
+// Executing publish script: node path/to/publish.mjs {name} --version {version} --tag {tag}
+// Default "tag" to "next" so we won't publish the "latest" tag by accident.
+const [, , name, version, tag = 'next'] = process.argv
+
+// A simple SemVer validation to validate the version
+const validVersion = /^\d+\.\d+\.\d+(-\w+\.\d+)?/
+invariant(
+  version && validVersion.test(version),
+  `No version provided or version did not match Semantic Versioning, expected: #.#.#-tag.# or #.#.#, got ${version}.`
+)
+
+const graph = readCachedProjectGraph()
+const project = graph.nodes[name]
+
+invariant(project, `Could not find project "${name}" in the workspace. Is the project.json configured correctly?`)
+
+const outputPath = project.data?.targets?.build?.options?.outputPath
+invariant(
+  outputPath,
+  `Could not find "build.options.outputPath" of project "${name}". Is project.json configured  correctly?`
+)
+
+process.chdir(outputPath)
+
+// Updating the version in "package.json" before publishing
+try {
+  const json = JSON.parse(readFileSync(`package.json`).toString())
+  json.version = version
+  writeFileSync(`package.json`, JSON.stringify(json, null, 2))
+} catch (e) {
+  console.error(chalk.bold.red(`Error reading package.json file from library build output.`))
+}
+
+// Execute "npm publish" to publish
+execSync(`npm publish --access public --tag ${tag}`)
diff --git a/tsconfig.base.json b/tsconfig.base.json
index c7dce16414..e341874f5d 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -1,5 +1,6 @@
 {
   "compilerOptions": {
+    "baseUrl": "src",
     "target": "es5",
     "lib": ["dom", "dom.iterable", "esnext"],
     "allowJs": true,
@@ -21,7 +22,11 @@
     "isolatedModules": true,
     "downlevelIteration": true,
     "allowSyntheticDefaultImports": true,
-    "types": ["react-spring", "jest"]
+    "types": ["react-spring", "jest"],
+    "paths": {
+      "@cowprotocol/ui": ["libs/ui/src/index.ts"],
+      "@cowprotocol/ui-utils": ["libs/ui-utils/src/index.ts"]
+    }
   },
   "exclude": ["node_modules", "cypress"]
 }
diff --git a/tsconfig.json b/tsconfig.json
index f58c75d333..92d39058f7 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -5,11 +5,6 @@
     "noEmit": true,
     "baseUrl": "src"
   },
-  "exclude": [
-    "node_modules",
-    "cypress",
-  ],
-  "include": [
-    "src/**/*"
-  ]
+  "exclude": ["node_modules", "cypress"],
+  "include": ["src/**/*"]
 }
diff --git a/tsconfig.spec.json b/tsconfig.spec.json
new file mode 100644
index 0000000000..cd2c387006
--- /dev/null
+++ b/tsconfig.spec.json
@@ -0,0 +1,9 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "./dist/out-tsc",
+    "module": "commonjs",
+    "types": ["jest", "node"]
+  },
+  "include": ["jest.config.ts", "src/**/*.test.ts", "src/**/*.spec.ts", "src/**/*.d.ts"]
+}
diff --git a/yarn.lock b/yarn.lock
index 15e35441f6..e5a26e0dc8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -61,6 +61,14 @@
     "@jridgewell/gen-mapping" "^0.1.0"
     "@jridgewell/trace-mapping" "^0.3.9"
 
+"@ampproject/remapping@^2.2.0":
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.1.tgz#99e8e11851128b8702cd57c33684f1d0f260b630"
+  integrity sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==
+  dependencies:
+    "@jridgewell/gen-mapping" "^0.3.0"
+    "@jridgewell/trace-mapping" "^0.3.9"
+
 "@apideck/better-ajv-errors@^0.3.1":
   version "0.3.6"
   resolved "https://registry.yarnpkg.com/@apideck/better-ajv-errors/-/better-ajv-errors-0.3.6.tgz#957d4c28e886a64a8141f7522783be65733ff097"
@@ -82,11 +90,23 @@
   dependencies:
     "@babel/highlight" "^7.18.6"
 
+"@babel/code-frame@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.22.5.tgz#234d98e1551960604f1246e6475891a570ad5658"
+  integrity sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ==
+  dependencies:
+    "@babel/highlight" "^7.22.5"
+
 "@babel/compat-data@^7.17.7", "@babel/compat-data@^7.20.1", "@babel/compat-data@^7.20.5":
   version "7.20.10"
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.10.tgz#9d92fa81b87542fff50e848ed585b4212c1d34ec"
   integrity sha512-sEnuDPpOJR/fcafHMjpcpGN5M2jbUGUHwmuWKM/YdPzeEDJg8bgmbcWQFUfE32MQjti1koACvoPVsDe8Uq+idg==
 
+"@babel/compat-data@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.22.5.tgz#b1f6c86a02d85d2dd3368a2b67c09add8cd0c255"
+  integrity sha512-4Jc/YuIaYqKnDDz892kPIledykKg12Aw1PYX5i/TY28anJtacvM1Rrr8wbieB9GfEJwlzqT0hUEao0CxEebiDA==
+
 "@babel/core@^7.1.0", "@babel/core@^7.11.1", "@babel/core@^7.12.3", "@babel/core@^7.16.0", "@babel/core@^7.7.2", "@babel/core@^7.8.0":
   version "7.20.12"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.20.12.tgz#7930db57443c6714ad216953d1356dac0eb8496d"
@@ -108,6 +128,27 @@
     json5 "^2.2.2"
     semver "^6.3.0"
 
+"@babel/core@^7.11.6", "@babel/core@^7.15.0", "@babel/core@^7.20.12", "@babel/core@^7.21.3":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.22.5.tgz#d67d9747ecf26ee7ecd3ebae1ee22225fe902a89"
+  integrity sha512-SBuTAjg91A3eKOvD+bPEz3LlhHZRNu1nFOVts9lzDJTXshHTjII0BAtDS3Y2DAkdZdDKWVZGVwkDfc4Clxn1dg==
+  dependencies:
+    "@ampproject/remapping" "^2.2.0"
+    "@babel/code-frame" "^7.22.5"
+    "@babel/generator" "^7.22.5"
+    "@babel/helper-compilation-targets" "^7.22.5"
+    "@babel/helper-module-transforms" "^7.22.5"
+    "@babel/helpers" "^7.22.5"
+    "@babel/parser" "^7.22.5"
+    "@babel/template" "^7.22.5"
+    "@babel/traverse" "^7.22.5"
+    "@babel/types" "^7.22.5"
+    convert-source-map "^1.7.0"
+    debug "^4.1.0"
+    gensync "^1.0.0-beta.2"
+    json5 "^2.2.2"
+    semver "^6.3.0"
+
 "@babel/eslint-parser@^7.16.3":
   version "7.19.1"
   resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.19.1.tgz#4f68f6b0825489e00a24b41b6a1ae35414ecd2f4"
@@ -126,6 +167,16 @@
     "@jridgewell/gen-mapping" "^0.3.2"
     jsesc "^2.5.1"
 
+"@babel/generator@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.22.5.tgz#1e7bf768688acfb05cf30b2369ef855e82d984f7"
+  integrity sha512-+lcUbnTRhd0jOewtFSedLyiPsD5tswKkbgcezOqqWFUVNEwoUTlpPOBmvhG7OXWLR4jMdv0czPGH5XbflnD1EA==
+  dependencies:
+    "@babel/types" "^7.22.5"
+    "@jridgewell/gen-mapping" "^0.3.2"
+    "@jridgewell/trace-mapping" "^0.3.17"
+    jsesc "^2.5.1"
+
 "@babel/helper-annotate-as-pure@^7.16.0", "@babel/helper-annotate-as-pure@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz#eaa49f6f80d5a33f9a5dd2276e6d6e451be0a6bb"
@@ -133,6 +184,13 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
+"@babel/helper-annotate-as-pure@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz#e7f06737b197d580a01edf75d97e2c8be99d3882"
+  integrity sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==
+  dependencies:
+    "@babel/types" "^7.22.5"
+
 "@babel/helper-builder-binary-assignment-operator-visitor@^7.18.6":
   version "7.18.9"
   resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.9.tgz#acd4edfd7a566d1d51ea975dff38fd52906981bb"
@@ -141,6 +199,13 @@
     "@babel/helper-explode-assignable-expression" "^7.18.6"
     "@babel/types" "^7.18.9"
 
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.5.tgz#a3f4758efdd0190d8927fcffd261755937c71878"
+  integrity sha512-m1EP3lVOPptR+2DwD125gziZNcmoNSHGmJROKoy87loWUQyJaVXDgpmruWqDARZSmtYQ+Dl25okU8+qhVzuykw==
+  dependencies:
+    "@babel/types" "^7.22.5"
+
 "@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.18.9", "@babel/helper-compilation-targets@^7.20.0", "@babel/helper-compilation-targets@^7.20.7":
   version "7.20.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz#a6cd33e93629f5eb473b021aac05df62c4cd09bb"
@@ -152,6 +217,17 @@
     lru-cache "^5.1.1"
     semver "^6.3.0"
 
+"@babel/helper-compilation-targets@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.5.tgz#fc7319fc54c5e2fa14b2909cf3c5fd3046813e02"
+  integrity sha512-Ji+ywpHeuqxB8WDxraCiqR0xfhYjiDE/e6k7FuIaANnoOFxAHskHChz4vA1mJC9Lbm01s1PVAGhQY4FUKSkGZw==
+  dependencies:
+    "@babel/compat-data" "^7.22.5"
+    "@babel/helper-validator-option" "^7.22.5"
+    browserslist "^4.21.3"
+    lru-cache "^5.1.1"
+    semver "^6.3.0"
+
 "@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.20.5", "@babel/helper-create-class-features-plugin@^7.20.7":
   version "7.20.12"
   resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.20.12.tgz#4349b928e79be05ed2d1643b20b99bb87c503819"
@@ -166,6 +242,21 @@
     "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0"
     "@babel/helper-split-export-declaration" "^7.18.6"
 
+"@babel/helper-create-class-features-plugin@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.5.tgz#2192a1970ece4685fbff85b48da2c32fcb130b7c"
+  integrity sha512-xkb58MyOYIslxu3gKmVXmjTtUPvBU4odYzbiIQbWwLKIHCsx6UGZGX6F1IznMFVnDdirseUZopzN+ZRt8Xb33Q==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.22.5"
+    "@babel/helper-environment-visitor" "^7.22.5"
+    "@babel/helper-function-name" "^7.22.5"
+    "@babel/helper-member-expression-to-functions" "^7.22.5"
+    "@babel/helper-optimise-call-expression" "^7.22.5"
+    "@babel/helper-replace-supers" "^7.22.5"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
+    "@babel/helper-split-export-declaration" "^7.22.5"
+    semver "^6.3.0"
+
 "@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.20.5":
   version "7.20.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.20.5.tgz#5ea79b59962a09ec2acf20a963a01ab4d076ccca"
@@ -174,6 +265,15 @@
     "@babel/helper-annotate-as-pure" "^7.18.6"
     regexpu-core "^5.2.1"
 
+"@babel/helper-create-regexp-features-plugin@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.5.tgz#bb2bf0debfe39b831986a4efbf4066586819c6e4"
+  integrity sha512-1VpEFOIbMRaXyDeUwUfmTIxExLwQ+zkW+Bh5zXpApA3oQedBx9v/updixWxnx/bZpKw7u8VxWjb/qWpIcmPq8A==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.22.5"
+    regexpu-core "^5.3.1"
+    semver "^6.3.0"
+
 "@babel/helper-define-polyfill-provider@^0.3.3":
   version "0.3.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz#8612e55be5d51f0cd1f36b4a5a83924e89884b7a"
@@ -186,11 +286,28 @@
     resolve "^1.14.2"
     semver "^6.1.2"
 
+"@babel/helper-define-polyfill-provider@^0.4.0":
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.0.tgz#487053f103110f25b9755c5980e031e93ced24d8"
+  integrity sha512-RnanLx5ETe6aybRi1cO/edaRH+bNYWaryCEmjDDYyNr4wnSzyOp8T0dWipmqVHKEY3AbVKUom50AKSlj1zmKbg==
+  dependencies:
+    "@babel/helper-compilation-targets" "^7.17.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
+    debug "^4.1.1"
+    lodash.debounce "^4.0.8"
+    resolve "^1.14.2"
+    semver "^6.1.2"
+
 "@babel/helper-environment-visitor@^7.18.9":
   version "7.18.9"
   resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz#0c0cee9b35d2ca190478756865bb3528422f51be"
   integrity sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==
 
+"@babel/helper-environment-visitor@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz#f06dd41b7c1f44e1f8da6c4055b41ab3a09a7e98"
+  integrity sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==
+
 "@babel/helper-explode-assignable-expression@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz#41f8228ef0a6f1a036b8dfdfec7ce94f9a6bc096"
@@ -206,6 +323,14 @@
     "@babel/template" "^7.18.10"
     "@babel/types" "^7.19.0"
 
+"@babel/helper-function-name@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz#ede300828905bb15e582c037162f99d5183af1be"
+  integrity sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==
+  dependencies:
+    "@babel/template" "^7.22.5"
+    "@babel/types" "^7.22.5"
+
 "@babel/helper-hoist-variables@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz#d4d2c8fb4baeaa5c68b99cc8245c56554f926678"
@@ -213,6 +338,13 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
+"@babel/helper-hoist-variables@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz#c01a007dac05c085914e8fb652b339db50d823bb"
+  integrity sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==
+  dependencies:
+    "@babel/types" "^7.22.5"
+
 "@babel/helper-member-expression-to-functions@^7.20.7":
   version "7.20.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.20.7.tgz#a6f26e919582275a93c3aa6594756d71b0bb7f05"
@@ -220,6 +352,13 @@
   dependencies:
     "@babel/types" "^7.20.7"
 
+"@babel/helper-member-expression-to-functions@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.22.5.tgz#0a7c56117cad3372fbf8d2fb4bf8f8d64a1e76b2"
+  integrity sha512-aBiH1NKMG0H2cGZqspNvsaBe6wNGjbJjuLy29aU+eDZjSbbN53BaxlpB02xm9v34pLTZ1nIQPFYn2qMZoa5BQQ==
+  dependencies:
+    "@babel/types" "^7.22.5"
+
 "@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.10.4", "@babel/helper-module-imports@^7.16.0", "@babel/helper-module-imports@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz#1e3ebdbbd08aad1437b428c50204db13c5a3ca6e"
@@ -227,6 +366,13 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
+"@babel/helper-module-imports@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz#1a8f4c9f4027d23f520bd76b364d44434a72660c"
+  integrity sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==
+  dependencies:
+    "@babel/types" "^7.22.5"
+
 "@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.20.11":
   version "7.20.11"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.20.11.tgz#df4c7af713c557938c50ea3ad0117a7944b2f1b0"
@@ -241,6 +387,20 @@
     "@babel/traverse" "^7.20.10"
     "@babel/types" "^7.20.7"
 
+"@babel/helper-module-transforms@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.22.5.tgz#0f65daa0716961b6e96b164034e737f60a80d2ef"
+  integrity sha512-+hGKDt/Ze8GFExiVHno/2dvG5IdstpzCq0y4Qc9OJ25D4q3pKfiIP/4Vp3/JvhDkLKsDK2api3q3fpIgiIF5bw==
+  dependencies:
+    "@babel/helper-environment-visitor" "^7.22.5"
+    "@babel/helper-module-imports" "^7.22.5"
+    "@babel/helper-simple-access" "^7.22.5"
+    "@babel/helper-split-export-declaration" "^7.22.5"
+    "@babel/helper-validator-identifier" "^7.22.5"
+    "@babel/template" "^7.22.5"
+    "@babel/traverse" "^7.22.5"
+    "@babel/types" "^7.22.5"
+
 "@babel/helper-optimise-call-expression@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz#9369aa943ee7da47edab2cb4e838acf09d290ffe"
@@ -248,11 +408,23 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
+"@babel/helper-optimise-call-expression@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz#f21531a9ccbff644fdd156b4077c16ff0c3f609e"
+  integrity sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==
+  dependencies:
+    "@babel/types" "^7.22.5"
+
 "@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.18.9", "@babel/helper-plugin-utils@^7.19.0", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
   version "7.20.2"
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz#d1b9000752b18d0877cff85a5c376ce5c3121629"
   integrity sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==
 
+"@babel/helper-plugin-utils@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz#dd7ee3735e8a313b9f7b05a773d892e88e6d7295"
+  integrity sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==
+
 "@babel/helper-remap-async-to-generator@^7.18.9":
   version "7.18.9"
   resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz#997458a0e3357080e54e1d79ec347f8a8cd28519"
@@ -263,6 +435,16 @@
     "@babel/helper-wrap-function" "^7.18.9"
     "@babel/types" "^7.18.9"
 
+"@babel/helper-remap-async-to-generator@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.5.tgz#14a38141a7bf2165ad38da61d61cf27b43015da2"
+  integrity sha512-cU0Sq1Rf4Z55fgz7haOakIyM7+x/uCFwXpLPaeRzfoUtAEAuUZjZvFPjL/rk5rW693dIgn2hng1W7xbT7lWT4g==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.22.5"
+    "@babel/helper-environment-visitor" "^7.22.5"
+    "@babel/helper-wrap-function" "^7.22.5"
+    "@babel/types" "^7.22.5"
+
 "@babel/helper-replace-supers@^7.18.6", "@babel/helper-replace-supers@^7.20.7":
   version "7.20.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.20.7.tgz#243ecd2724d2071532b2c8ad2f0f9f083bcae331"
@@ -275,6 +457,18 @@
     "@babel/traverse" "^7.20.7"
     "@babel/types" "^7.20.7"
 
+"@babel/helper-replace-supers@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.22.5.tgz#71bc5fb348856dea9fdc4eafd7e2e49f585145dc"
+  integrity sha512-aLdNM5I3kdI/V9xGNyKSF3X/gTyMUBohTZ+/3QdQKAA9vxIiy12E+8E2HoOP1/DjeqU+g6as35QHJNMDDYpuCg==
+  dependencies:
+    "@babel/helper-environment-visitor" "^7.22.5"
+    "@babel/helper-member-expression-to-functions" "^7.22.5"
+    "@babel/helper-optimise-call-expression" "^7.22.5"
+    "@babel/template" "^7.22.5"
+    "@babel/traverse" "^7.22.5"
+    "@babel/types" "^7.22.5"
+
 "@babel/helper-simple-access@^7.20.2":
   version "7.20.2"
   resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz#0ab452687fe0c2cfb1e2b9e0015de07fc2d62dd9"
@@ -282,6 +476,13 @@
   dependencies:
     "@babel/types" "^7.20.2"
 
+"@babel/helper-simple-access@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz#4938357dc7d782b80ed6dbb03a0fba3d22b1d5de"
+  integrity sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==
+  dependencies:
+    "@babel/types" "^7.22.5"
+
 "@babel/helper-skip-transparent-expression-wrappers@^7.20.0":
   version "7.20.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.20.0.tgz#fbe4c52f60518cab8140d77101f0e63a8a230684"
@@ -289,6 +490,13 @@
   dependencies:
     "@babel/types" "^7.20.0"
 
+"@babel/helper-skip-transparent-expression-wrappers@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz#007f15240b5751c537c40e77abb4e89eeaaa8847"
+  integrity sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==
+  dependencies:
+    "@babel/types" "^7.22.5"
+
 "@babel/helper-split-export-declaration@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz#7367949bc75b20c6d5a5d4a97bba2824ae8ef075"
@@ -296,21 +504,43 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
+"@babel/helper-split-export-declaration@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.5.tgz#88cf11050edb95ed08d596f7a044462189127a08"
+  integrity sha512-thqK5QFghPKWLhAV321lxF95yCg2K3Ob5yw+M3VHWfdia0IkPXUtoLH8x/6Fh486QUvzhb8YOWHChTVen2/PoQ==
+  dependencies:
+    "@babel/types" "^7.22.5"
+
 "@babel/helper-string-parser@^7.19.4":
   version "7.19.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz#38d3acb654b4701a9b77fb0615a96f775c3a9e63"
   integrity sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==
 
+"@babel/helper-string-parser@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz#533f36457a25814cf1df6488523ad547d784a99f"
+  integrity sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==
+
 "@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.19.1":
   version "7.19.1"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2"
   integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==
 
+"@babel/helper-validator-identifier@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz#9544ef6a33999343c8740fa51350f30eeaaaf193"
+  integrity sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==
+
 "@babel/helper-validator-option@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz#bf0d2b5a509b1f336099e4ff36e1a63aa5db4db8"
   integrity sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==
 
+"@babel/helper-validator-option@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz#de52000a15a177413c8234fa3a8af4ee8102d0ac"
+  integrity sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw==
+
 "@babel/helper-wrap-function@^7.18.9":
   version "7.20.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.20.5.tgz#75e2d84d499a0ab3b31c33bcfe59d6b8a45f62e3"
@@ -321,6 +551,16 @@
     "@babel/traverse" "^7.20.5"
     "@babel/types" "^7.20.5"
 
+"@babel/helper-wrap-function@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.22.5.tgz#44d205af19ed8d872b4eefb0d2fa65f45eb34f06"
+  integrity sha512-bYqLIBSEshYcYQyfks8ewYA8S30yaGSeRslcvKMvoUk6HHPySbxHq9YRi6ghhzEU+yhQv9bP/jXnygkStOcqZw==
+  dependencies:
+    "@babel/helper-function-name" "^7.22.5"
+    "@babel/template" "^7.22.5"
+    "@babel/traverse" "^7.22.5"
+    "@babel/types" "^7.22.5"
+
 "@babel/helpers@^7.20.7":
   version "7.20.7"
   resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.20.7.tgz#04502ff0feecc9f20ecfaad120a18f011a8e6dce"
@@ -330,6 +570,15 @@
     "@babel/traverse" "^7.20.7"
     "@babel/types" "^7.20.7"
 
+"@babel/helpers@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.22.5.tgz#74bb4373eb390d1ceed74a15ef97767e63120820"
+  integrity sha512-pSXRmfE1vzcUIDFQcSGA5Mr+GxBV9oiRKDuDxXvWQQBCh8HoIjs/2DlDB7H8smac1IVrB9/xdXj2N3Wol9Cr+Q==
+  dependencies:
+    "@babel/template" "^7.22.5"
+    "@babel/traverse" "^7.22.5"
+    "@babel/types" "^7.22.5"
+
 "@babel/highlight@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf"
@@ -339,11 +588,25 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
+"@babel/highlight@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.5.tgz#aa6c05c5407a67ebce408162b7ede789b4d22031"
+  integrity sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.22.5"
+    chalk "^2.0.0"
+    js-tokens "^4.0.0"
+
 "@babel/parser@^7.1.0", "@babel/parser@^7.11.5", "@babel/parser@^7.14.4", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7":
   version "7.20.7"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.7.tgz#66fe23b3c8569220817d5feb8b9dcdc95bb4f71b"
   integrity sha512-T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg==
 
+"@babel/parser@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.22.5.tgz#721fd042f3ce1896238cf1b341c77eb7dee7dbea"
+  integrity sha512-DFZMC9LJUG9PLOclRC32G63UXwzqS2koQC8dkx+PLdmt1xSePYpbT/NbsrJy8Q/muXz7o/h/d4A7Fuyixm559Q==
+
 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz#da5b8f9a580acdfbe53494dba45ea389fb09a4d2"
@@ -351,6 +614,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
 
+"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.5.tgz#87245a21cd69a73b0b81bcda98d443d6df08f05e"
+  integrity sha512-NP1M5Rf+u2Gw9qfSO4ihjcTGW5zXTi36ITLd4/EoAcEhIZ0yjMqmftDNl3QC19CX7olhrjpyU454g/2W7X0jvQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
 "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.18.9":
   version "7.20.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.20.7.tgz#d9c85589258539a22a901033853101a6198d4ef1"
@@ -360,6 +630,15 @@
     "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0"
     "@babel/plugin-proposal-optional-chaining" "^7.20.7"
 
+"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.5.tgz#fef09f9499b1f1c930da8a0c419db42167d792ca"
+  integrity sha512-31Bb65aZaUwqCbWMnZPduIZxCBngHFlzyN6Dq6KAJjtx+lx6ohKHubc61OomYi7XwVD4Ol0XCVz4h+pYFR048g==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
+    "@babel/plugin-transform-optional-chaining" "^7.22.5"
+
 "@babel/plugin-proposal-async-generator-functions@^7.20.1":
   version "7.20.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.7.tgz#bfb7276d2d573cb67ba379984a2334e262ba5326"
@@ -370,7 +649,7 @@
     "@babel/helper-remap-async-to-generator" "^7.18.9"
     "@babel/plugin-syntax-async-generators" "^7.8.4"
 
-"@babel/plugin-proposal-class-properties@^7.16.0", "@babel/plugin-proposal-class-properties@^7.18.6":
+"@babel/plugin-proposal-class-properties@^7.14.5", "@babel/plugin-proposal-class-properties@^7.16.0", "@babel/plugin-proposal-class-properties@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz#b110f59741895f7ec21a6fff696ec46265c446a3"
   integrity sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==
@@ -387,6 +666,17 @@
     "@babel/helper-plugin-utils" "^7.20.2"
     "@babel/plugin-syntax-class-static-block" "^7.14.5"
 
+"@babel/plugin-proposal-decorators@^7.14.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.22.5.tgz#dc8cdda048e5aea947efda920e030199806b868d"
+  integrity sha512-h8hlezQ4dl6ixodgXkH8lUfcD7x+WAuIqPUjwGoItynrXOAv4a4Tci1zA/qjzQjjcl0v3QpLdc2LM6ZACQuY7A==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-replace-supers" "^7.22.5"
+    "@babel/helper-split-export-declaration" "^7.22.5"
+    "@babel/plugin-syntax-decorators" "^7.22.5"
+
 "@babel/plugin-proposal-decorators@^7.16.4":
   version "7.20.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.20.7.tgz#05d37453c2ce818f3e47bbeda9468c8de947eecc"
@@ -482,6 +772,11 @@
     "@babel/helper-create-class-features-plugin" "^7.18.6"
     "@babel/helper-plugin-utils" "^7.18.6"
 
+"@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2":
+  version "7.21.0-placeholder-for-preset-env.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz#7844f9289546efa9febac2de4cfe358a050bd703"
+  integrity sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==
+
 "@babel/plugin-proposal-private-property-in-object@^7.18.6":
   version "7.20.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.20.5.tgz#309c7668f2263f1c711aa399b5a9a6291eef6135"
@@ -535,6 +830,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.19.0"
 
+"@babel/plugin-syntax-decorators@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.22.5.tgz#329fe2907c73de184033775637dbbc507f09116a"
+  integrity sha512-avpUOBS7IU6al8MmF1XpAyj9QYeLPuSDJI5D4pVMSMdL7xQokKqJPYQC67RCT0aCTashUXPiGwMJ0DEXXCEmMA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
 "@babel/plugin-syntax-dynamic-import@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3"
@@ -563,7 +865,21 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.19.0"
 
-"@babel/plugin-syntax-import-meta@^7.8.3":
+"@babel/plugin-syntax-import-assertions@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.22.5.tgz#07d252e2aa0bc6125567f742cd58619cb14dce98"
+  integrity sha512-rdV97N7KqsRzeNGoWUOK6yUsWarLjE5Su/Snk9IYPU9CwkWHs4t+rTGOvffTR8XGkJMTAdLfO0xVnXm8wugIJg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-syntax-import-attributes@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.22.5.tgz#ab840248d834410b829f569f5262b9e517555ecb"
+  integrity sha512-KwvoWDeNKPETmozyFE0P2rOLqh39EoQHNjqizrI5B8Vt0ZNS7M56s7dAiAqbYfiAYOuIzIh96z3iR2ktgu3tEg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-syntax-import-meta@^7.10.4", "@babel/plugin-syntax-import-meta@^7.8.3":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz#ee601348c370fa334d2207be158777496521fd51"
   integrity sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==
@@ -584,6 +900,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
 
+"@babel/plugin-syntax-jsx@^7.22.5", "@babel/plugin-syntax-jsx@^7.7.2":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.22.5.tgz#a6b68e84fb76e759fc3b93e901876ffabbe1d918"
+  integrity sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
 "@babel/plugin-syntax-logical-assignment-operators@^7.10.4", "@babel/plugin-syntax-logical-assignment-operators@^7.8.3":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699"
@@ -647,6 +970,21 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.19.0"
 
+"@babel/plugin-syntax-typescript@^7.22.5", "@babel/plugin-syntax-typescript@^7.3.3":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.22.5.tgz#aac8d383b062c5072c647a31ef990c1d0af90272"
+  integrity sha512-1mS2o03i7t1c6VzH6fdQ3OA8tcEIxwG18zIPRp+UY1Ihv6W+XZzBCVxExF9upussPXJ0xE9XRHwMoNs1ep/nRQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-syntax-unicode-sets-regex@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz#d49a3b3e6b52e5be6740022317580234a6a47357"
+  integrity sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
+
 "@babel/plugin-transform-arrow-functions@^7.18.6":
   version "7.20.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.20.7.tgz#bea332b0e8b2dab3dafe55a163d8227531ab0551"
@@ -654,6 +992,23 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.20.2"
 
+"@babel/plugin-transform-arrow-functions@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.22.5.tgz#e5ba566d0c58a5b2ba2a8b795450641950b71958"
+  integrity sha512-26lTNXoVRdAnsaDXPpvCNUq+OVWEVC6bx7Vvz9rC53F2bagUWW4u4ii2+h8Fejfh7RYqPxn+libeFBBck9muEw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-async-generator-functions@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.5.tgz#7336356d23380eda9a56314974f053a020dab0c3"
+  integrity sha512-gGOEvFzm3fWoyD5uZq7vVTD57pPJ3PczPUD/xCFGjzBpUosnklmXyKnGQbbbGs1NPNPskFex0j93yKbHt0cHyg==
+  dependencies:
+    "@babel/helper-environment-visitor" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-remap-async-to-generator" "^7.22.5"
+    "@babel/plugin-syntax-async-generators" "^7.8.4"
+
 "@babel/plugin-transform-async-to-generator@^7.18.6":
   version "7.20.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.20.7.tgz#dfee18623c8cb31deb796aa3ca84dda9cea94354"
@@ -663,6 +1018,15 @@
     "@babel/helper-plugin-utils" "^7.20.2"
     "@babel/helper-remap-async-to-generator" "^7.18.9"
 
+"@babel/plugin-transform-async-to-generator@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.22.5.tgz#c7a85f44e46f8952f6d27fe57c2ed3cc084c3775"
+  integrity sha512-b1A8D8ZzE/VhNDoV1MSJTnpKkCG5bJo+19R4o4oy03zM7ws8yEMK755j61Dc3EyvdysbqH5BOOTquJ7ZX9C6vQ==
+  dependencies:
+    "@babel/helper-module-imports" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-remap-async-to-generator" "^7.22.5"
+
 "@babel/plugin-transform-block-scoped-functions@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz#9187bf4ba302635b9d70d986ad70f038726216a8"
@@ -670,6 +1034,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
 
+"@babel/plugin-transform-block-scoped-functions@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.22.5.tgz#27978075bfaeb9fa586d3cb63a3d30c1de580024"
+  integrity sha512-tdXZ2UdknEKQWKJP1KMNmuF5Lx3MymtMN/pvA+p/VEkhK8jVcQ1fzSy8KM9qRYhAf2/lV33hoMPKI/xaI9sADA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
 "@babel/plugin-transform-block-scoping@^7.20.2":
   version "7.20.11"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.20.11.tgz#9f5a3424bd112a3f32fe0cf9364fbb155cff262a"
@@ -677,6 +1048,30 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.20.2"
 
+"@babel/plugin-transform-block-scoping@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.22.5.tgz#8bfc793b3a4b2742c0983fadc1480d843ecea31b"
+  integrity sha512-EcACl1i5fSQ6bt+YGuU/XGCeZKStLmyVGytWkpyhCLeQVA0eu6Wtiw92V+I1T/hnezUv7j74dA/Ro69gWcU+hg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-class-properties@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.22.5.tgz#97a56e31ad8c9dc06a0b3710ce7803d5a48cca77"
+  integrity sha512-nDkQ0NfkOhPTq8YCLiWNxp1+f9fCobEjCb0n8WdbNUBc4IB5V7P1QnX9IjpSoquKrXF5SKojHleVNs2vGeHCHQ==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-class-static-block@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.22.5.tgz#3e40c46f048403472d6f4183116d5e46b1bff5ba"
+  integrity sha512-SPToJ5eYZLxlnp1UzdARpOGeC2GbHvr9d/UV0EukuVx8atktg194oe+C5BqQ8jRTkgLRVOPYeXRSBg1IlMoVRA==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-class-static-block" "^7.14.5"
+
 "@babel/plugin-transform-classes@^7.20.2":
   version "7.20.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.20.7.tgz#f438216f094f6bb31dc266ebfab8ff05aecad073"
@@ -692,6 +1087,21 @@
     "@babel/helper-split-export-declaration" "^7.18.6"
     globals "^11.1.0"
 
+"@babel/plugin-transform-classes@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.5.tgz#635d4e98da741fad814984639f4c0149eb0135e1"
+  integrity sha512-2edQhLfibpWpsVBx2n/GKOz6JdGQvLruZQfGr9l1qes2KQaWswjBzhQF7UDUZMNaMMQeYnQzxwOMPsbYF7wqPQ==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.22.5"
+    "@babel/helper-compilation-targets" "^7.22.5"
+    "@babel/helper-environment-visitor" "^7.22.5"
+    "@babel/helper-function-name" "^7.22.5"
+    "@babel/helper-optimise-call-expression" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-replace-supers" "^7.22.5"
+    "@babel/helper-split-export-declaration" "^7.22.5"
+    globals "^11.1.0"
+
 "@babel/plugin-transform-computed-properties@^7.18.9":
   version "7.20.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.20.7.tgz#704cc2fd155d1c996551db8276d55b9d46e4d0aa"
@@ -700,6 +1110,14 @@
     "@babel/helper-plugin-utils" "^7.20.2"
     "@babel/template" "^7.20.7"
 
+"@babel/plugin-transform-computed-properties@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.22.5.tgz#cd1e994bf9f316bd1c2dafcd02063ec261bb3869"
+  integrity sha512-4GHWBgRf0krxPX+AaPtgBAlTgTeZmqDynokHOX7aqqAB4tHs3U2Y02zH6ETFdLZGcg9UQSD1WCmkVrE9ErHeOg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/template" "^7.22.5"
+
 "@babel/plugin-transform-destructuring@^7.20.2":
   version "7.20.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.20.7.tgz#8bda578f71620c7de7c93af590154ba331415454"
@@ -707,6 +1125,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.20.2"
 
+"@babel/plugin-transform-destructuring@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.22.5.tgz#d3aca7438f6c26c78cdd0b0ba920a336001b27cc"
+  integrity sha512-GfqcFuGW8vnEqTUBM7UtPd5A4q797LTvvwKxXTgRsFjoqaJiEg9deBG6kWeQYkVEL569NpnmpC0Pkr/8BLKGnQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
 "@babel/plugin-transform-dotall-regex@^7.18.6", "@babel/plugin-transform-dotall-regex@^7.4.4":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz#b286b3e7aae6c7b861e45bed0a2fafd6b1a4fef8"
@@ -715,6 +1140,14 @@
     "@babel/helper-create-regexp-features-plugin" "^7.18.6"
     "@babel/helper-plugin-utils" "^7.18.6"
 
+"@babel/plugin-transform-dotall-regex@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.22.5.tgz#dbb4f0e45766eb544e193fb00e65a1dd3b2a4165"
+  integrity sha512-5/Yk9QxCQCl+sOIB1WelKnVRxTJDSAIxtJLL2/pqL14ZVlbH0fUQUZa/T5/UnQtBNgghR7mfB8ERBKyKPCi7Vw==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+
 "@babel/plugin-transform-duplicate-keys@^7.18.9":
   version "7.18.9"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz#687f15ee3cdad6d85191eb2a372c4528eaa0ae0e"
@@ -722,6 +1155,21 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.9"
 
+"@babel/plugin-transform-duplicate-keys@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.22.5.tgz#b6e6428d9416f5f0bba19c70d1e6e7e0b88ab285"
+  integrity sha512-dEnYD+9BBgld5VBXHnF/DbYGp3fqGMsyxKbtD1mDyIA7AkTSpKXFhCVuj/oQVOoALfBs77DudA0BE4d5mcpmqw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-dynamic-import@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.22.5.tgz#d6908a8916a810468c4edff73b5b75bda6ad393e"
+  integrity sha512-0MC3ppTB1AMxd8fXjSrbPa7LT9hrImt+/fcj+Pg5YMD7UQyWp/02+JWpdnCymmsXwIx5Z+sYn1bwCn4ZJNvhqQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
+
 "@babel/plugin-transform-exponentiation-operator@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz#421c705f4521888c65e91fdd1af951bfefd4dacd"
@@ -730,6 +1178,22 @@
     "@babel/helper-builder-binary-assignment-operator-visitor" "^7.18.6"
     "@babel/helper-plugin-utils" "^7.18.6"
 
+"@babel/plugin-transform-exponentiation-operator@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.22.5.tgz#402432ad544a1f9a480da865fda26be653e48f6a"
+  integrity sha512-vIpJFNM/FjZ4rh1myqIya9jXwrwwgFRHPjT3DkUA9ZLHuzox8jiXkOLvwm1H+PQIP3CqfC++WPKeuDi0Sjdj1g==
+  dependencies:
+    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-export-namespace-from@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.22.5.tgz#57c41cb1d0613d22f548fddd8b288eedb9973a5b"
+  integrity sha512-X4hhm7FRnPgd4nDA4b/5V280xCx6oL7Oob5+9qVS5C13Zq4bh1qq7LU0GgRU6b5dBWBvhGaXYVB4AcN6+ol6vg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
+
 "@babel/plugin-transform-flow-strip-types@^7.16.0":
   version "7.19.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.19.0.tgz#e9e8606633287488216028719638cbbb2f2dde8f"
@@ -745,6 +1209,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
 
+"@babel/plugin-transform-for-of@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.5.tgz#ab1b8a200a8f990137aff9a084f8de4099ab173f"
+  integrity sha512-3kxQjX1dU9uudwSshyLeEipvrLjBCVthCgeTp6CzE/9JYrlAIaeekVxRpCWsDDfYTfRZRoCeZatCQvwo+wvK8A==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
 "@babel/plugin-transform-function-name@^7.18.9":
   version "7.18.9"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.9.tgz#cc354f8234e62968946c61a46d6365440fc764e0"
@@ -754,6 +1225,23 @@
     "@babel/helper-function-name" "^7.18.9"
     "@babel/helper-plugin-utils" "^7.18.9"
 
+"@babel/plugin-transform-function-name@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.22.5.tgz#935189af68b01898e0d6d99658db6b164205c143"
+  integrity sha512-UIzQNMS0p0HHiQm3oelztj+ECwFnj+ZRV4KnguvlsD2of1whUeM6o7wGNj6oLwcDoAXQ8gEqfgC24D+VdIcevg==
+  dependencies:
+    "@babel/helper-compilation-targets" "^7.22.5"
+    "@babel/helper-function-name" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-json-strings@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.22.5.tgz#14b64352fdf7e1f737eed68de1a1468bd2a77ec0"
+  integrity sha512-DuCRB7fu8MyTLbEQd1ew3R85nx/88yMoqo2uPSjevMj3yoN7CDM8jkgrY0wmVxfJZyJ/B9fE1iq7EQppWQmR5A==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-json-strings" "^7.8.3"
+
 "@babel/plugin-transform-literals@^7.18.9":
   version "7.18.9"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz#72796fdbef80e56fba3c6a699d54f0de557444bc"
@@ -761,6 +1249,21 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.9"
 
+"@babel/plugin-transform-literals@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.22.5.tgz#e9341f4b5a167952576e23db8d435849b1dd7920"
+  integrity sha512-fTLj4D79M+mepcw3dgFBTIDYpbcB9Sm0bpm4ppXPaO+U+PKFFyV9MGRvS0gvGw62sd10kT5lRMKXAADb9pWy8g==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-logical-assignment-operators@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.22.5.tgz#66ae5f068fd5a9a5dc570df16f56c2a8462a9d6c"
+  integrity sha512-MQQOUW1KL8X0cDWfbwYP+TbVbZm16QmQXJQ+vndPtH/BoO0lOKpVoEDMI7+PskYxH+IiE0tS8xZye0qr1lGzSA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
+
 "@babel/plugin-transform-member-expression-literals@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz#ac9fdc1a118620ac49b7e7a5d2dc177a1bfee88e"
@@ -768,6 +1271,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
 
+"@babel/plugin-transform-member-expression-literals@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.22.5.tgz#4fcc9050eded981a468347dd374539ed3e058def"
+  integrity sha512-RZEdkNtzzYCFl9SE9ATaUMTj2hqMb4StarOJLrZRbqqU4HSBE7UlBw9WBWQiDzrJZJdUWiMTVDI6Gv/8DPvfew==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
 "@babel/plugin-transform-modules-amd@^7.19.6":
   version "7.20.11"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.20.11.tgz#3daccca8e4cc309f03c3a0c4b41dc4b26f55214a"
@@ -776,6 +1286,14 @@
     "@babel/helper-module-transforms" "^7.20.11"
     "@babel/helper-plugin-utils" "^7.20.2"
 
+"@babel/plugin-transform-modules-amd@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.22.5.tgz#4e045f55dcf98afd00f85691a68fc0780704f526"
+  integrity sha512-R+PTfLTcYEmb1+kK7FNkhQ1gP4KgjpSO6HfH9+f8/yfp2Nt3ggBjiVpRwmwTlfqZLafYKJACy36yDXlEmI9HjQ==
+  dependencies:
+    "@babel/helper-module-transforms" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+
 "@babel/plugin-transform-modules-commonjs@^7.19.6":
   version "7.20.11"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.20.11.tgz#8cb23010869bf7669fd4b3098598b6b2be6dc607"
@@ -785,6 +1303,15 @@
     "@babel/helper-plugin-utils" "^7.20.2"
     "@babel/helper-simple-access" "^7.20.2"
 
+"@babel/plugin-transform-modules-commonjs@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.22.5.tgz#7d9875908d19b8c0536085af7b053fd5bd651bfa"
+  integrity sha512-B4pzOXj+ONRmuaQTg05b3y/4DuFz3WcCNAXPLb2Q0GT0TrGKGxNKV4jwsXts+StaM0LQczZbOpj8o1DLPDJIiA==
+  dependencies:
+    "@babel/helper-module-transforms" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-simple-access" "^7.22.5"
+
 "@babel/plugin-transform-modules-systemjs@^7.19.6":
   version "7.20.11"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.20.11.tgz#467ec6bba6b6a50634eea61c9c232654d8a4696e"
@@ -795,6 +1322,16 @@
     "@babel/helper-plugin-utils" "^7.20.2"
     "@babel/helper-validator-identifier" "^7.19.1"
 
+"@babel/plugin-transform-modules-systemjs@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.22.5.tgz#18c31410b5e579a0092638f95c896c2a98a5d496"
+  integrity sha512-emtEpoaTMsOs6Tzz+nbmcePl6AKVtS1yC4YNAeMun9U8YCsgadPNxnOPQ8GhHFB2qdx+LZu9LgoC0Lthuu05DQ==
+  dependencies:
+    "@babel/helper-hoist-variables" "^7.22.5"
+    "@babel/helper-module-transforms" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-validator-identifier" "^7.22.5"
+
 "@babel/plugin-transform-modules-umd@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz#81d3832d6034b75b54e62821ba58f28ed0aab4b9"
@@ -803,6 +1340,14 @@
     "@babel/helper-module-transforms" "^7.18.6"
     "@babel/helper-plugin-utils" "^7.18.6"
 
+"@babel/plugin-transform-modules-umd@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.22.5.tgz#4694ae40a87b1745e3775b6a7fe96400315d4f98"
+  integrity sha512-+S6kzefN/E1vkSsKx8kmQuqeQsvCKCd1fraCM7zXm4SFoggI099Tr4G8U81+5gtMdUeMQ4ipdQffbKLX0/7dBQ==
+  dependencies:
+    "@babel/helper-module-transforms" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+
 "@babel/plugin-transform-named-capturing-groups-regex@^7.19.1":
   version "7.20.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.20.5.tgz#626298dd62ea51d452c3be58b285d23195ba69a8"
@@ -811,6 +1356,14 @@
     "@babel/helper-create-regexp-features-plugin" "^7.20.5"
     "@babel/helper-plugin-utils" "^7.20.2"
 
+"@babel/plugin-transform-named-capturing-groups-regex@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.22.5.tgz#67fe18ee8ce02d57c855185e27e3dc959b2e991f"
+  integrity sha512-YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+
 "@babel/plugin-transform-new-target@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz#d128f376ae200477f37c4ddfcc722a8a1b3246a8"
@@ -818,6 +1371,40 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
 
+"@babel/plugin-transform-new-target@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.22.5.tgz#1b248acea54ce44ea06dfd37247ba089fcf9758d"
+  integrity sha512-AsF7K0Fx/cNKVyk3a+DW0JLo+Ua598/NxMRvxDnkpCIGFh43+h/v2xyhRUYf6oD8gE4QtL83C7zZVghMjHd+iw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-nullish-coalescing-operator@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.22.5.tgz#f8872c65776e0b552e0849d7596cddd416c3e381"
+  integrity sha512-6CF8g6z1dNYZ/VXok5uYkkBBICHZPiGEl7oDnAx2Mt1hlHVHOSIKWJaXHjQJA5VB43KZnXZDIexMchY4y2PGdA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
+
+"@babel/plugin-transform-numeric-separator@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.22.5.tgz#57226a2ed9e512b9b446517ab6fa2d17abb83f58"
+  integrity sha512-NbslED1/6M+sXiwwtcAB/nieypGw02Ejf4KtDeMkCEpP6gWFMX1wI9WKYua+4oBneCCEmulOkRpwywypVZzs/g==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
+
+"@babel/plugin-transform-object-rest-spread@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.5.tgz#9686dc3447df4753b0b2a2fae7e8bc33cdc1f2e1"
+  integrity sha512-Kk3lyDmEslH9DnvCDA1s1kkd3YWQITiBOHngOtDL9Pt6BZjzqb6hiOlb8VfjiiQJ2unmegBqZu0rx5RxJb5vmQ==
+  dependencies:
+    "@babel/compat-data" "^7.22.5"
+    "@babel/helper-compilation-targets" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
+    "@babel/plugin-transform-parameters" "^7.22.5"
+
 "@babel/plugin-transform-object-super@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz#fb3c6ccdd15939b6ff7939944b51971ddc35912c"
@@ -826,6 +1413,31 @@
     "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/helper-replace-supers" "^7.18.6"
 
+"@babel/plugin-transform-object-super@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.22.5.tgz#794a8d2fcb5d0835af722173c1a9d704f44e218c"
+  integrity sha512-klXqyaT9trSjIUrcsYIfETAzmOEZL3cBYqOYLJxBHfMFFggmXOv+NYSX/Jbs9mzMVESw/WycLFPRx8ba/b2Ipw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-replace-supers" "^7.22.5"
+
+"@babel/plugin-transform-optional-catch-binding@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.22.5.tgz#842080be3076703be0eaf32ead6ac8174edee333"
+  integrity sha512-pH8orJahy+hzZje5b8e2QIlBWQvGpelS76C63Z+jhZKsmzfNaPQ+LaW6dcJ9bxTpo1mtXbgHwy765Ro3jftmUg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
+
+"@babel/plugin-transform-optional-chaining@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.5.tgz#1003762b9c14295501beb41be72426736bedd1e0"
+  integrity sha512-AconbMKOMkyG+xCng2JogMCDcqW8wedQAqpVIL4cOSescZ7+iW8utC6YDZLMCSUIReEA733gzRSaOSXMAt/4WQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
+
 "@babel/plugin-transform-parameters@^7.20.1", "@babel/plugin-transform-parameters@^7.20.7":
   version "7.20.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.20.7.tgz#0ee349e9d1bc96e78e3b37a7af423a4078a7083f"
@@ -833,6 +1445,31 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.20.2"
 
+"@babel/plugin-transform-parameters@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.5.tgz#c3542dd3c39b42c8069936e48717a8d179d63a18"
+  integrity sha512-AVkFUBurORBREOmHRKo06FjHYgjrabpdqRSwq6+C7R5iTCZOsM4QbcB27St0a4U6fffyAOqh3s/qEfybAhfivg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-private-methods@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.22.5.tgz#21c8af791f76674420a147ae62e9935d790f8722"
+  integrity sha512-PPjh4gyrQnGe97JTalgRGMuU4icsZFnWkzicB/fUtzlKUqvsWBKEpPPfr5a2JiyirZkHxnAqkQMO5Z5B2kK3fA==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-private-property-in-object@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.22.5.tgz#07a77f28cbb251546a43d175a1dda4cf3ef83e32"
+  integrity sha512-/9xnaTTJcVoBtSSmrVyhtSvO3kbqS2ODoh2juEU72c3aYonNF0OMGiaz2gjukyKM2wBBYJP38S4JiE0Wfb5VMQ==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.22.5"
+    "@babel/helper-create-class-features-plugin" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
+
 "@babel/plugin-transform-property-literals@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz#e22498903a483448e94e032e9bbb9c5ccbfc93a3"
@@ -840,6 +1477,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
 
+"@babel/plugin-transform-property-literals@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.22.5.tgz#b5ddabd73a4f7f26cd0e20f5db48290b88732766"
+  integrity sha512-TiOArgddK3mK/x1Qwf5hay2pxI6wCZnvQqrFSqbtg1GLl2JcNMitVH/YnqjP+M31pLUeTfzY1HAXFDnUBV30rQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
 "@babel/plugin-transform-react-constant-elements@^7.12.1":
   version "7.20.2"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.20.2.tgz#3f02c784e0b711970d7d8ccc96c4359d64e27ac7"
@@ -847,6 +1491,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.20.2"
 
+"@babel/plugin-transform-react-constant-elements@^7.21.3":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.22.5.tgz#6dfa7c1c37f7d7279e417ceddf5a04abb8bb9c29"
+  integrity sha512-BF5SXoO+nX3h5OhlN78XbbDrBOffv+AxPP2ENaJOVqjWCgBDeOY3WcaUcddutGSfoap+5NEQ/q/4I3WZIvgkXA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
 "@babel/plugin-transform-react-display-name@^7.16.0", "@babel/plugin-transform-react-display-name@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.18.6.tgz#8b1125f919ef36ebdfff061d664e266c666b9415"
@@ -854,6 +1505,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
 
+"@babel/plugin-transform-react-display-name@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.22.5.tgz#3c4326f9fce31c7968d6cb9debcaf32d9e279a2b"
+  integrity sha512-PVk3WPYudRF5z4GKMEYUrLjPl38fJSKNaEOkFuoprioowGuWN6w2RKznuFNSlJx7pzzXXStPUnNSOEO0jL5EVw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
 "@babel/plugin-transform-react-jsx-development@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.18.6.tgz#dbe5c972811e49c7405b630e4d0d2e1380c0ddc5"
@@ -861,6 +1519,27 @@
   dependencies:
     "@babel/plugin-transform-react-jsx" "^7.18.6"
 
+"@babel/plugin-transform-react-jsx-development@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.22.5.tgz#e716b6edbef972a92165cd69d92f1255f7e73e87"
+  integrity sha512-bDhuzwWMuInwCYeDeMzyi7TaBgRQei6DqxhbyniL7/VG4RSS7HtSL2QbY4eESy1KJqlWt8g3xeEBGPuo+XqC8A==
+  dependencies:
+    "@babel/plugin-transform-react-jsx" "^7.22.5"
+
+"@babel/plugin-transform-react-jsx-self@^7.18.6":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.22.5.tgz#ca2fdc11bc20d4d46de01137318b13d04e481d8e"
+  integrity sha512-nTh2ogNUtxbiSbxaT4Ds6aXnXEipHweN9YRgOX/oNXdf0cCrGn/+2LozFa3lnPV5D90MkjhgckCPBrsoSc1a7g==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-react-jsx-source@^7.19.6":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.22.5.tgz#49af1615bfdf6ed9d3e9e43e425e0b2b65d15b6c"
+  integrity sha512-yIiRO6yobeEIaI0RTbIr8iAK9FcBHLtZq0S89ZPjDLQXBA4xvghaKqI0etp/tF3htTM0sazJKKLz9oEiGRtu7w==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
 "@babel/plugin-transform-react-jsx@^7.18.6":
   version "7.20.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.20.7.tgz#025d85a1935fd7e19dfdcb1b1d4df34d4da484f7"
@@ -872,6 +1551,17 @@
     "@babel/plugin-syntax-jsx" "^7.18.6"
     "@babel/types" "^7.20.7"
 
+"@babel/plugin-transform-react-jsx@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.22.5.tgz#932c291eb6dd1153359e2a90cb5e557dcf068416"
+  integrity sha512-rog5gZaVbUip5iWDMTYbVM15XQq+RkUKhET/IHR6oizR+JEoN6CAfTTuHcK4vwUyzca30qqHqEpzBOnaRMWYMA==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.22.5"
+    "@babel/helper-module-imports" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-jsx" "^7.22.5"
+    "@babel/types" "^7.22.5"
+
 "@babel/plugin-transform-react-pure-annotations@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.18.6.tgz#561af267f19f3e5d59291f9950fd7b9663d0d844"
@@ -880,6 +1570,14 @@
     "@babel/helper-annotate-as-pure" "^7.18.6"
     "@babel/helper-plugin-utils" "^7.18.6"
 
+"@babel/plugin-transform-react-pure-annotations@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.22.5.tgz#1f58363eef6626d6fa517b95ac66fe94685e32c0"
+  integrity sha512-gP4k85wx09q+brArVinTXhWiyzLl9UpmGva0+mWyKxk6JZequ05x3eUcIUE+FyttPKJFRRVtAvQaJ6YF9h1ZpA==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+
 "@babel/plugin-transform-regenerator@^7.18.6":
   version "7.20.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.20.5.tgz#57cda588c7ffb7f4f8483cc83bdcea02a907f04d"
@@ -888,6 +1586,14 @@
     "@babel/helper-plugin-utils" "^7.20.2"
     regenerator-transform "^0.15.1"
 
+"@babel/plugin-transform-regenerator@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.5.tgz#cd8a68b228a5f75fa01420e8cc2fc400f0fc32aa"
+  integrity sha512-rR7KePOE7gfEtNTh9Qw+iO3Q/e4DEsoQ+hdvM6QUDH7JRJ5qxq5AA52ZzBWbI5i9lfNuvySgOGP8ZN7LAmaiPw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+    regenerator-transform "^0.15.1"
+
 "@babel/plugin-transform-reserved-words@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz#b1abd8ebf8edaa5f7fe6bbb8d2133d23b6a6f76a"
@@ -895,6 +1601,25 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
 
+"@babel/plugin-transform-reserved-words@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.22.5.tgz#832cd35b81c287c4bcd09ce03e22199641f964fb"
+  integrity sha512-DTtGKFRQUDm8svigJzZHzb/2xatPc6TzNvAIJ5GqOKDsGFYgAskjRulbR/vGsPKq3OPqtexnz327qYpP57RFyA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-runtime@^7.15.0":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.22.5.tgz#ca975fb5e260044473c8142e1b18b567d33c2a3b"
+  integrity sha512-bg4Wxd1FWeFx3daHFTWk1pkSWK/AyQuiyAoeZAOkAOUBjnZPH6KT7eMxouV47tQ6hl6ax2zyAWBdWZXbrvXlaw==
+  dependencies:
+    "@babel/helper-module-imports" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    babel-plugin-polyfill-corejs2 "^0.4.3"
+    babel-plugin-polyfill-corejs3 "^0.8.1"
+    babel-plugin-polyfill-regenerator "^0.5.0"
+    semver "^6.3.0"
+
 "@babel/plugin-transform-runtime@^7.16.4", "@babel/plugin-transform-runtime@^7.5.5":
   version "7.19.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.19.6.tgz#9d2a9dbf4e12644d6f46e5e75bfbf02b5d6e9194"
@@ -914,6 +1639,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
 
+"@babel/plugin-transform-shorthand-properties@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.22.5.tgz#6e277654be82b5559fc4b9f58088507c24f0c624"
+  integrity sha512-vM4fq9IXHscXVKzDv5itkO1X52SmdFBFcMIBZ2FRn2nqVYqw6dBexUgMvAjHW+KXpPPViD/Yo3GrDEBaRC0QYA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
 "@babel/plugin-transform-spread@^7.19.0":
   version "7.20.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.20.7.tgz#c2d83e0b99d3bf83e07b11995ee24bf7ca09401e"
@@ -922,6 +1654,14 @@
     "@babel/helper-plugin-utils" "^7.20.2"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0"
 
+"@babel/plugin-transform-spread@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.22.5.tgz#6487fd29f229c95e284ba6c98d65eafb893fea6b"
+  integrity sha512-5ZzDQIGyvN4w8+dMmpohL6MBo+l2G7tfC/O2Dg7/hjpgeWvUx8FzfeOKxGog9IimPa4YekaQ9PlDqTLOljkcxg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
+
 "@babel/plugin-transform-sticky-regex@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz#c6706eb2b1524028e317720339583ad0f444adcc"
@@ -929,6 +1669,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
 
+"@babel/plugin-transform-sticky-regex@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.22.5.tgz#295aba1595bfc8197abd02eae5fc288c0deb26aa"
+  integrity sha512-zf7LuNpHG0iEeiyCNwX4j3gDg1jgt1k3ZdXBKbZSoA3BbGQGvMiSvfbZRR3Dr3aeJe3ooWFZxOOG3IRStYp2Bw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
 "@babel/plugin-transform-template-literals@^7.18.9":
   version "7.18.9"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz#04ec6f10acdaa81846689d63fae117dd9c243a5e"
@@ -936,6 +1683,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.9"
 
+"@babel/plugin-transform-template-literals@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.22.5.tgz#8f38cf291e5f7a8e60e9f733193f0bcc10909bff"
+  integrity sha512-5ciOehRNf+EyUeewo8NkbQiUs4d6ZxiHo6BcBcnFlgiJfu16q0bQUw9Jvo0b0gBKFG1SMhDSjeKXSYuJLeFSMA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
 "@babel/plugin-transform-typeof-symbol@^7.18.9":
   version "7.18.9"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz#c8cea68263e45addcd6afc9091429f80925762c0"
@@ -943,6 +1697,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.9"
 
+"@babel/plugin-transform-typeof-symbol@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.22.5.tgz#5e2ba478da4b603af8673ff7c54f75a97b716b34"
+  integrity sha512-bYkI5lMzL4kPii4HHEEChkD0rkc+nvnlR6+o/qdqR6zrm0Sv/nodmyLhlq2DO0YKLUNd2VePmPRjJXSBh9OIdA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
 "@babel/plugin-transform-typescript@^7.18.6":
   version "7.20.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.20.7.tgz#673f49499cd810ae32a1ea5f3f8fab370987e055"
@@ -952,6 +1713,16 @@
     "@babel/helper-plugin-utils" "^7.20.2"
     "@babel/plugin-syntax-typescript" "^7.20.0"
 
+"@babel/plugin-transform-typescript@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.22.5.tgz#5c0f7adfc1b5f38c4dbc8f79b1f0f8074134bd7d"
+  integrity sha512-SMubA9S7Cb5sGSFFUlqxyClTA9zWJ8qGQrppNUm05LtFuN1ELRFNndkix4zUJrC9F+YivWwa1dHMSyo0e0N9dA==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.22.5"
+    "@babel/helper-create-class-features-plugin" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-typescript" "^7.22.5"
+
 "@babel/plugin-transform-unicode-escapes@^7.18.10":
   version "7.18.10"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.10.tgz#1ecfb0eda83d09bbcb77c09970c2dd55832aa246"
@@ -959,6 +1730,21 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.9"
 
+"@babel/plugin-transform-unicode-escapes@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.22.5.tgz#ce0c248522b1cb22c7c992d88301a5ead70e806c"
+  integrity sha512-biEmVg1IYB/raUO5wT1tgfacCef15Fbzhkx493D3urBI++6hpJ+RFG4SrWMn0NEZLfvilqKf3QDrRVZHo08FYg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-unicode-property-regex@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.22.5.tgz#098898f74d5c1e86660dc112057b2d11227f1c81"
+  integrity sha512-HCCIb+CbJIAE6sXn5CjFQXMwkCClcOfPCzTlilJ8cUatfzwHlWQkbtV0zD338u9dZskwvuOYTuuaMaA8J5EI5A==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+
 "@babel/plugin-transform-unicode-regex@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz#194317225d8c201bbae103364ffe9e2cea36cdca"
@@ -967,6 +1753,22 @@
     "@babel/helper-create-regexp-features-plugin" "^7.18.6"
     "@babel/helper-plugin-utils" "^7.18.6"
 
+"@babel/plugin-transform-unicode-regex@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.22.5.tgz#ce7e7bb3ef208c4ff67e02a22816656256d7a183"
+  integrity sha512-028laaOKptN5vHJf9/Arr/HiJekMd41hOEZYvNsrsXqJ7YPYuX2bQxh31fkZzGmq3YqHRJzYFFAVYvKfMPKqyg==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-unicode-sets-regex@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.22.5.tgz#77788060e511b708ffc7d42fdfbc5b37c3004e91"
+  integrity sha512-lhMfi4FC15j13eKrh3DnYHjpGj6UKQHtNKTbtc1igvAhRy4+kLhV07OpLcsN0VgDEw/MjAvJO4BdMJsHwMhzCg==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+
 "@babel/preset-env@^7.11.0", "@babel/preset-env@^7.12.1", "@babel/preset-env@^7.16.4":
   version "7.20.2"
   resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.20.2.tgz#9b1642aa47bb9f43a86f9630011780dab7f86506"
@@ -1048,6 +1850,92 @@
     core-js-compat "^3.25.1"
     semver "^6.3.0"
 
+"@babel/preset-env@^7.15.0", "@babel/preset-env@^7.20.2":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.22.5.tgz#3da66078b181f3d62512c51cf7014392c511504e"
+  integrity sha512-fj06hw89dpiZzGZtxn+QybifF07nNiZjZ7sazs2aVDcysAZVGjW7+7iFYxg6GLNM47R/thYfLdrXc+2f11Vi9A==
+  dependencies:
+    "@babel/compat-data" "^7.22.5"
+    "@babel/helper-compilation-targets" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-validator-option" "^7.22.5"
+    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.22.5"
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.22.5"
+    "@babel/plugin-proposal-private-property-in-object" "7.21.0-placeholder-for-preset-env.2"
+    "@babel/plugin-syntax-async-generators" "^7.8.4"
+    "@babel/plugin-syntax-class-properties" "^7.12.13"
+    "@babel/plugin-syntax-class-static-block" "^7.14.5"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
+    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
+    "@babel/plugin-syntax-import-assertions" "^7.22.5"
+    "@babel/plugin-syntax-import-attributes" "^7.22.5"
+    "@babel/plugin-syntax-import-meta" "^7.10.4"
+    "@babel/plugin-syntax-json-strings" "^7.8.3"
+    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
+    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
+    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
+    "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
+    "@babel/plugin-syntax-top-level-await" "^7.14.5"
+    "@babel/plugin-syntax-unicode-sets-regex" "^7.18.6"
+    "@babel/plugin-transform-arrow-functions" "^7.22.5"
+    "@babel/plugin-transform-async-generator-functions" "^7.22.5"
+    "@babel/plugin-transform-async-to-generator" "^7.22.5"
+    "@babel/plugin-transform-block-scoped-functions" "^7.22.5"
+    "@babel/plugin-transform-block-scoping" "^7.22.5"
+    "@babel/plugin-transform-class-properties" "^7.22.5"
+    "@babel/plugin-transform-class-static-block" "^7.22.5"
+    "@babel/plugin-transform-classes" "^7.22.5"
+    "@babel/plugin-transform-computed-properties" "^7.22.5"
+    "@babel/plugin-transform-destructuring" "^7.22.5"
+    "@babel/plugin-transform-dotall-regex" "^7.22.5"
+    "@babel/plugin-transform-duplicate-keys" "^7.22.5"
+    "@babel/plugin-transform-dynamic-import" "^7.22.5"
+    "@babel/plugin-transform-exponentiation-operator" "^7.22.5"
+    "@babel/plugin-transform-export-namespace-from" "^7.22.5"
+    "@babel/plugin-transform-for-of" "^7.22.5"
+    "@babel/plugin-transform-function-name" "^7.22.5"
+    "@babel/plugin-transform-json-strings" "^7.22.5"
+    "@babel/plugin-transform-literals" "^7.22.5"
+    "@babel/plugin-transform-logical-assignment-operators" "^7.22.5"
+    "@babel/plugin-transform-member-expression-literals" "^7.22.5"
+    "@babel/plugin-transform-modules-amd" "^7.22.5"
+    "@babel/plugin-transform-modules-commonjs" "^7.22.5"
+    "@babel/plugin-transform-modules-systemjs" "^7.22.5"
+    "@babel/plugin-transform-modules-umd" "^7.22.5"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.22.5"
+    "@babel/plugin-transform-new-target" "^7.22.5"
+    "@babel/plugin-transform-nullish-coalescing-operator" "^7.22.5"
+    "@babel/plugin-transform-numeric-separator" "^7.22.5"
+    "@babel/plugin-transform-object-rest-spread" "^7.22.5"
+    "@babel/plugin-transform-object-super" "^7.22.5"
+    "@babel/plugin-transform-optional-catch-binding" "^7.22.5"
+    "@babel/plugin-transform-optional-chaining" "^7.22.5"
+    "@babel/plugin-transform-parameters" "^7.22.5"
+    "@babel/plugin-transform-private-methods" "^7.22.5"
+    "@babel/plugin-transform-private-property-in-object" "^7.22.5"
+    "@babel/plugin-transform-property-literals" "^7.22.5"
+    "@babel/plugin-transform-regenerator" "^7.22.5"
+    "@babel/plugin-transform-reserved-words" "^7.22.5"
+    "@babel/plugin-transform-shorthand-properties" "^7.22.5"
+    "@babel/plugin-transform-spread" "^7.22.5"
+    "@babel/plugin-transform-sticky-regex" "^7.22.5"
+    "@babel/plugin-transform-template-literals" "^7.22.5"
+    "@babel/plugin-transform-typeof-symbol" "^7.22.5"
+    "@babel/plugin-transform-unicode-escapes" "^7.22.5"
+    "@babel/plugin-transform-unicode-property-regex" "^7.22.5"
+    "@babel/plugin-transform-unicode-regex" "^7.22.5"
+    "@babel/plugin-transform-unicode-sets-regex" "^7.22.5"
+    "@babel/preset-modules" "^0.1.5"
+    "@babel/types" "^7.22.5"
+    babel-plugin-polyfill-corejs2 "^0.4.3"
+    babel-plugin-polyfill-corejs3 "^0.8.1"
+    babel-plugin-polyfill-regenerator "^0.5.0"
+    core-js-compat "^3.30.2"
+    semver "^6.3.0"
+
 "@babel/preset-modules@^0.1.5":
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.5.tgz#ef939d6e7f268827e1841638dc6ff95515e115d9"
@@ -1071,6 +1959,29 @@
     "@babel/plugin-transform-react-jsx-development" "^7.18.6"
     "@babel/plugin-transform-react-pure-annotations" "^7.18.6"
 
+"@babel/preset-react@^7.18.6":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.22.5.tgz#c4d6058fbf80bccad02dd8c313a9aaa67e3c3dd6"
+  integrity sha512-M+Is3WikOpEJHgR385HbuCITPTaPRaNkibTEa9oiofmJvIsrceb4yp9RL9Kb+TE8LznmeyZqpP+Lopwcx59xPQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-validator-option" "^7.22.5"
+    "@babel/plugin-transform-react-display-name" "^7.22.5"
+    "@babel/plugin-transform-react-jsx" "^7.22.5"
+    "@babel/plugin-transform-react-jsx-development" "^7.22.5"
+    "@babel/plugin-transform-react-pure-annotations" "^7.22.5"
+
+"@babel/preset-typescript@^7.15.0", "@babel/preset-typescript@^7.21.0":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.22.5.tgz#16367d8b01d640e9a507577ed4ee54e0101e51c8"
+  integrity sha512-YbPaal9LxztSGhmndR46FmAbkJ/1fAsw293tSU+I5E5h+cnJ3d4GTwyUgGYmOXJYdGA+uNePle4qbaRzj2NISQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-validator-option" "^7.22.5"
+    "@babel/plugin-syntax-jsx" "^7.22.5"
+    "@babel/plugin-transform-modules-commonjs" "^7.22.5"
+    "@babel/plugin-transform-typescript" "^7.22.5"
+
 "@babel/preset-typescript@^7.16.0":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.18.6.tgz#ce64be3e63eddc44240c6358daefac17b3186399"
@@ -1080,6 +1991,11 @@
     "@babel/helper-validator-option" "^7.18.6"
     "@babel/plugin-transform-typescript" "^7.18.6"
 
+"@babel/regjsgen@^0.8.0":
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/@babel/regjsgen/-/regjsgen-0.8.0.tgz#f0ba69b075e1f05fb2825b7fad991e7adbb18310"
+  integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==
+
 "@babel/runtime@^7.0.0", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.16.3", "@babel/runtime@^7.17.0", "@babel/runtime@^7.17.2", "@babel/runtime@^7.20.7", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2":
   version "7.20.7"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.20.7.tgz#fcb41a5a70550e04a7b708037c7c32f7f356d8fd"
@@ -1087,6 +2003,13 @@
   dependencies:
     regenerator-runtime "^0.13.11"
 
+"@babel/runtime@^7.14.8", "@babel/runtime@^7.15.4":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.22.5.tgz#8564dd588182ce0047d55d7a75e93921107b57ec"
+  integrity sha512-ecjvYlnAaZ/KVneE/OdKYBYfgXV3Ptu6zQWmgEF7vwKhQnvVS6bjMD2XYgj+SNvQ1GfK/pjgokfPkC/2CO8CuA==
+  dependencies:
+    regenerator-runtime "^0.13.11"
+
 "@babel/template@^7.18.10", "@babel/template@^7.20.7", "@babel/template@^7.3.3":
   version "7.20.7"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.20.7.tgz#a15090c2839a83b02aa996c0b4994005841fd5a8"
@@ -1096,6 +2019,31 @@
     "@babel/parser" "^7.20.7"
     "@babel/types" "^7.20.7"
 
+"@babel/template@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.5.tgz#0c8c4d944509875849bd0344ff0050756eefc6ec"
+  integrity sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==
+  dependencies:
+    "@babel/code-frame" "^7.22.5"
+    "@babel/parser" "^7.22.5"
+    "@babel/types" "^7.22.5"
+
+"@babel/traverse@^7.16.0", "@babel/traverse@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.22.5.tgz#44bd276690db6f4940fdb84e1cb4abd2f729ccd1"
+  integrity sha512-7DuIjPgERaNo6r+PZwItpjCZEa5vyw4eJGufeLxrPdBXBoLcCJCIasvK6pK/9DVNrLZTLFhUGqaC6X/PA007TQ==
+  dependencies:
+    "@babel/code-frame" "^7.22.5"
+    "@babel/generator" "^7.22.5"
+    "@babel/helper-environment-visitor" "^7.22.5"
+    "@babel/helper-function-name" "^7.22.5"
+    "@babel/helper-hoist-variables" "^7.22.5"
+    "@babel/helper-split-export-declaration" "^7.22.5"
+    "@babel/parser" "^7.22.5"
+    "@babel/types" "^7.22.5"
+    debug "^4.1.0"
+    globals "^11.1.0"
+
 "@babel/traverse@^7.20.10", "@babel/traverse@^7.20.12", "@babel/traverse@^7.20.5", "@babel/traverse@^7.20.7", "@babel/traverse@^7.4.5", "@babel/traverse@^7.7.2":
   version "7.20.12"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.12.tgz#7f0f787b3a67ca4475adef1f56cb94f6abd4a4b5"
@@ -1121,6 +2069,15 @@
     "@babel/helper-validator-identifier" "^7.19.1"
     to-fast-properties "^2.0.0"
 
+"@babel/types@^7.21.3", "@babel/types@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.22.5.tgz#cd93eeaab025880a3a47ec881f4b096a5b786fbe"
+  integrity sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==
+  dependencies:
+    "@babel/helper-string-parser" "^7.22.5"
+    "@babel/helper-validator-identifier" "^7.22.5"
+    to-fast-properties "^2.0.0"
+
 "@base2/pretty-print-object@1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@base2/pretty-print-object/-/pretty-print-object-1.0.1.tgz#371ba8be66d556812dc7fb169ebc3c08378f69d4"
@@ -1654,6 +2611,123 @@
   resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz#8eed982e2ee6f7f4e44c253e12962980791efd46"
   integrity sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA==
 
+"@esbuild/android-arm64@0.17.19":
+  version "0.17.19"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.17.19.tgz#bafb75234a5d3d1b690e7c2956a599345e84a2fd"
+  integrity sha512-KBMWvEZooR7+kzY0BtbTQn0OAYY7CsiydT63pVEaPtVYF0hXbUaOyZog37DKxK7NF3XacBJOpYT4adIJh+avxA==
+
+"@esbuild/android-arm@0.17.19":
+  version "0.17.19"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.17.19.tgz#5898f7832c2298bc7d0ab53701c57beb74d78b4d"
+  integrity sha512-rIKddzqhmav7MSmoFCmDIb6e2W57geRsM94gV2l38fzhXMwq7hZoClug9USI2pFRGL06f4IOPHHpFNOkWieR8A==
+
+"@esbuild/android-x64@0.17.19":
+  version "0.17.19"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.17.19.tgz#658368ef92067866d95fb268719f98f363d13ae1"
+  integrity sha512-uUTTc4xGNDT7YSArp/zbtmbhO0uEEK9/ETW29Wk1thYUJBz3IVnvgEiEwEa9IeLyvnpKrWK64Utw2bgUmDveww==
+
+"@esbuild/darwin-arm64@0.17.19":
+  version "0.17.19"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.17.19.tgz#584c34c5991b95d4d48d333300b1a4e2ff7be276"
+  integrity sha512-80wEoCfF/hFKM6WE1FyBHc9SfUblloAWx6FJkFWTWiCoht9Mc0ARGEM47e67W9rI09YoUxJL68WHfDRYEAvOhg==
+
+"@esbuild/darwin-x64@0.17.19":
+  version "0.17.19"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.17.19.tgz#7751d236dfe6ce136cce343dce69f52d76b7f6cb"
+  integrity sha512-IJM4JJsLhRYr9xdtLytPLSH9k/oxR3boaUIYiHkAawtwNOXKE8KoU8tMvryogdcT8AU+Bflmh81Xn6Q0vTZbQw==
+
+"@esbuild/freebsd-arm64@0.17.19":
+  version "0.17.19"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.19.tgz#cacd171665dd1d500f45c167d50c6b7e539d5fd2"
+  integrity sha512-pBwbc7DufluUeGdjSU5Si+P3SoMF5DQ/F/UmTSb8HXO80ZEAJmrykPyzo1IfNbAoaqw48YRpv8shwd1NoI0jcQ==
+
+"@esbuild/freebsd-x64@0.17.19":
+  version "0.17.19"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.17.19.tgz#0769456eee2a08b8d925d7c00b79e861cb3162e4"
+  integrity sha512-4lu+n8Wk0XlajEhbEffdy2xy53dpR06SlzvhGByyg36qJw6Kpfk7cp45DR/62aPH9mtJRmIyrXAS5UWBrJT6TQ==
+
+"@esbuild/linux-arm64@0.17.19":
+  version "0.17.19"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.17.19.tgz#38e162ecb723862c6be1c27d6389f48960b68edb"
+  integrity sha512-ct1Tg3WGwd3P+oZYqic+YZF4snNl2bsnMKRkb3ozHmnM0dGWuxcPTTntAF6bOP0Sp4x0PjSF+4uHQ1xvxfRKqg==
+
+"@esbuild/linux-arm@0.17.19":
+  version "0.17.19"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.17.19.tgz#1a2cd399c50040184a805174a6d89097d9d1559a"
+  integrity sha512-cdmT3KxjlOQ/gZ2cjfrQOtmhG4HJs6hhvm3mWSRDPtZ/lP5oe8FWceS10JaSJC13GBd4eH/haHnqf7hhGNLerA==
+
+"@esbuild/linux-ia32@0.17.19":
+  version "0.17.19"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.17.19.tgz#e28c25266b036ce1cabca3c30155222841dc035a"
+  integrity sha512-w4IRhSy1VbsNxHRQpeGCHEmibqdTUx61Vc38APcsRbuVgK0OPEnQ0YD39Brymn96mOx48Y2laBQGqgZ0j9w6SQ==
+
+"@esbuild/linux-loong64@0.17.19":
+  version "0.17.19"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.17.19.tgz#0f887b8bb3f90658d1a0117283e55dbd4c9dcf72"
+  integrity sha512-2iAngUbBPMq439a+z//gE+9WBldoMp1s5GWsUSgqHLzLJ9WoZLZhpwWuym0u0u/4XmZ3gpHmzV84PonE+9IIdQ==
+
+"@esbuild/linux-mips64el@0.17.19":
+  version "0.17.19"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.17.19.tgz#f5d2a0b8047ea9a5d9f592a178ea054053a70289"
+  integrity sha512-LKJltc4LVdMKHsrFe4MGNPp0hqDFA1Wpt3jE1gEyM3nKUvOiO//9PheZZHfYRfYl6AwdTH4aTcXSqBerX0ml4A==
+
+"@esbuild/linux-ppc64@0.17.19":
+  version "0.17.19"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.17.19.tgz#876590e3acbd9fa7f57a2c7d86f83717dbbac8c7"
+  integrity sha512-/c/DGybs95WXNS8y3Ti/ytqETiW7EU44MEKuCAcpPto3YjQbyK3IQVKfF6nbghD7EcLUGl0NbiL5Rt5DMhn5tg==
+
+"@esbuild/linux-riscv64@0.17.19":
+  version "0.17.19"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.17.19.tgz#7f49373df463cd9f41dc34f9b2262d771688bf09"
+  integrity sha512-FC3nUAWhvFoutlhAkgHf8f5HwFWUL6bYdvLc/TTuxKlvLi3+pPzdZiFKSWz/PF30TB1K19SuCxDTI5KcqASJqA==
+
+"@esbuild/linux-s390x@0.17.19":
+  version "0.17.19"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.17.19.tgz#e2afd1afcaf63afe2c7d9ceacd28ec57c77f8829"
+  integrity sha512-IbFsFbxMWLuKEbH+7sTkKzL6NJmG2vRyy6K7JJo55w+8xDk7RElYn6xvXtDW8HCfoKBFK69f3pgBJSUSQPr+4Q==
+
+"@esbuild/linux-x64@0.17.19":
+  version "0.17.19"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.17.19.tgz#8a0e9738b1635f0c53389e515ae83826dec22aa4"
+  integrity sha512-68ngA9lg2H6zkZcyp22tsVt38mlhWde8l3eJLWkyLrp4HwMUr3c1s/M2t7+kHIhvMjglIBrFpncX1SzMckomGw==
+
+"@esbuild/netbsd-x64@0.17.19":
+  version "0.17.19"
+  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.17.19.tgz#c29fb2453c6b7ddef9a35e2c18b37bda1ae5c462"
+  integrity sha512-CwFq42rXCR8TYIjIfpXCbRX0rp1jo6cPIUPSaWwzbVI4aOfX96OXY8M6KNmtPcg7QjYeDmN+DD0Wp3LaBOLf4Q==
+
+"@esbuild/openbsd-x64@0.17.19":
+  version "0.17.19"
+  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.17.19.tgz#95e75a391403cb10297280d524d66ce04c920691"
+  integrity sha512-cnq5brJYrSZ2CF6c35eCmviIN3k3RczmHz8eYaVlNasVqsNY+JKohZU5MKmaOI+KkllCdzOKKdPs762VCPC20g==
+
+"@esbuild/sunos-x64@0.17.19":
+  version "0.17.19"
+  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.17.19.tgz#722eaf057b83c2575937d3ffe5aeb16540da7273"
+  integrity sha512-vCRT7yP3zX+bKWFeP/zdS6SqdWB8OIpaRq/mbXQxTGHnIxspRtigpkUcDMlSCOejlHowLqII7K2JKevwyRP2rg==
+
+"@esbuild/win32-arm64@0.17.19":
+  version "0.17.19"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.17.19.tgz#9aa9dc074399288bdcdd283443e9aeb6b9552b6f"
+  integrity sha512-yYx+8jwowUstVdorcMdNlzklLYhPxjniHWFKgRqH7IFlUEa0Umu3KuYplf1HUZZ422e3NU9F4LGb+4O0Kdcaag==
+
+"@esbuild/win32-ia32@0.17.19":
+  version "0.17.19"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.17.19.tgz#95ad43c62ad62485e210f6299c7b2571e48d2b03"
+  integrity sha512-eggDKanJszUtCdlVs0RB+h35wNlb5v4TWEkq4vZcmVt5u/HiDZrTXe2bWFQUez3RgNHwx/x4sk5++4NSSicKkw==
+
+"@esbuild/win32-x64@0.17.19":
+  version "0.17.19"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.17.19.tgz#8cfaf2ff603e9aabb910e9c0558c26cf32744061"
+  integrity sha512-lAhycmKnVOuRYNtRtatQR1LPQf2oYCkRGkSFnseDAKPl8lu5SOsK/e1sXe5a0Pc5kHIHe6P2I/ilntNv2xf3cA==
+
+"@eslint-community/eslint-utils@^4.2.0":
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59"
+  integrity sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==
+  dependencies:
+    eslint-visitor-keys "^3.3.0"
+
 "@eslint/eslintrc@^1.4.1":
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.4.1.tgz#af58772019a2d271b7e2d4c23ff4ddcba3ccfb3e"
@@ -2054,6 +3128,18 @@
   resolved "https://registry.yarnpkg.com/@fontsource/inter/-/inter-4.5.14.tgz#3944b809aa7bf27dacd20bdc04a49fb738959724"
   integrity sha512-JDC9AocdPLuGsASkvWw9hS5gtHE7K9dOwL98XLrk5yjYqxy4uVnScG58NUvFMJDVJRl/7c8Wnap6PEs+7Zvj1Q==
 
+"@hapi/hoek@^9.0.0":
+  version "9.3.0"
+  resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.3.0.tgz#8368869dcb735be2e7f5cb7647de78e167a251fb"
+  integrity sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==
+
+"@hapi/topo@^5.0.0":
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/@hapi/topo/-/topo-5.1.0.tgz#dc448e332c6c6e37a4dc02fd84ba8d44b9afb012"
+  integrity sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==
+  dependencies:
+    "@hapi/hoek" "^9.0.0"
+
 "@humanwhocodes/config-array@^0.11.8":
   version "0.11.8"
   resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.8.tgz#03595ac2075a4dc0f191cc2131de14fbd7d410b9"
@@ -2128,6 +3214,18 @@
     jest-util "^28.1.3"
     slash "^3.0.0"
 
+"@jest/console@^29.5.0":
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/@jest/console/-/console-29.5.0.tgz#593a6c5c0d3f75689835f1b3b4688c4f8544cb57"
+  integrity sha512-NEpkObxPwyw/XxZVLPmAGKE89IQRp4puc6IQRPru6JKd1M3fW9v1xM1AnzIJE65hbCkzQAdnL8P47e9hzhiYLQ==
+  dependencies:
+    "@jest/types" "^29.5.0"
+    "@types/node" "*"
+    chalk "^4.0.0"
+    jest-message-util "^29.5.0"
+    jest-util "^29.5.0"
+    slash "^3.0.0"
+
 "@jest/core@^27.5.1":
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/@jest/core/-/core-27.5.1.tgz#267ac5f704e09dc52de2922cbf3af9edcd64b626"
@@ -2162,6 +3260,40 @@
     slash "^3.0.0"
     strip-ansi "^6.0.0"
 
+"@jest/core@^29.5.0":
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/@jest/core/-/core-29.5.0.tgz#76674b96904484e8214614d17261cc491e5f1f03"
+  integrity sha512-28UzQc7ulUrOQw1IsN/kv1QES3q2kkbl/wGslyhAclqZ/8cMdB5M68BffkIdSJgKBUt50d3hbwJ92XESlE7LiQ==
+  dependencies:
+    "@jest/console" "^29.5.0"
+    "@jest/reporters" "^29.5.0"
+    "@jest/test-result" "^29.5.0"
+    "@jest/transform" "^29.5.0"
+    "@jest/types" "^29.5.0"
+    "@types/node" "*"
+    ansi-escapes "^4.2.1"
+    chalk "^4.0.0"
+    ci-info "^3.2.0"
+    exit "^0.1.2"
+    graceful-fs "^4.2.9"
+    jest-changed-files "^29.5.0"
+    jest-config "^29.5.0"
+    jest-haste-map "^29.5.0"
+    jest-message-util "^29.5.0"
+    jest-regex-util "^29.4.3"
+    jest-resolve "^29.5.0"
+    jest-resolve-dependencies "^29.5.0"
+    jest-runner "^29.5.0"
+    jest-runtime "^29.5.0"
+    jest-snapshot "^29.5.0"
+    jest-util "^29.5.0"
+    jest-validate "^29.5.0"
+    jest-watcher "^29.5.0"
+    micromatch "^4.0.4"
+    pretty-format "^29.5.0"
+    slash "^3.0.0"
+    strip-ansi "^6.0.0"
+
 "@jest/environment@^27.5.1":
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-27.5.1.tgz#d7425820511fe7158abbecc010140c3fd3be9c74"
@@ -2172,6 +3304,16 @@
     "@types/node" "*"
     jest-mock "^27.5.1"
 
+"@jest/environment@^29.5.0":
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-29.5.0.tgz#9152d56317c1fdb1af389c46640ba74ef0bb4c65"
+  integrity sha512-5FXw2+wD29YU1d4I2htpRX7jYnAyTRjP2CsXQdo9SAM8g3ifxWPSV0HnClSn71xwctr0U3oZIIH+dtbfmnbXVQ==
+  dependencies:
+    "@jest/fake-timers" "^29.5.0"
+    "@jest/types" "^29.5.0"
+    "@types/node" "*"
+    jest-mock "^29.5.0"
+
 "@jest/expect-utils@^29.3.1":
   version "29.3.1"
   resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-29.3.1.tgz#531f737039e9b9e27c42449798acb5bba01935b6"
@@ -2179,6 +3321,21 @@
   dependencies:
     jest-get-type "^29.2.0"
 
+"@jest/expect-utils@^29.5.0":
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-29.5.0.tgz#f74fad6b6e20f924582dc8ecbf2cb800fe43a036"
+  integrity sha512-fmKzsidoXQT2KwnrwE0SQq3uj8Z763vzR8LnLBwC2qYWEFpjX8daRsk6rHUM1QvNlEW/UJXNXm59ztmJJWs2Mg==
+  dependencies:
+    jest-get-type "^29.4.3"
+
+"@jest/expect@^29.5.0":
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/@jest/expect/-/expect-29.5.0.tgz#80952f5316b23c483fbca4363ce822af79c38fba"
+  integrity sha512-PueDR2HGihN3ciUNGr4uelropW7rqUfTiOn+8u0leg/42UhblPxHkfoh0Ruu3I9Y1962P3u2DY4+h7GVTSVU6g==
+  dependencies:
+    expect "^29.5.0"
+    jest-snapshot "^29.5.0"
+
 "@jest/fake-timers@^27.5.1":
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-27.5.1.tgz#76979745ce0579c8a94a4678af7a748eda8ada74"
@@ -2191,6 +3348,18 @@
     jest-mock "^27.5.1"
     jest-util "^27.5.1"
 
+"@jest/fake-timers@^29.5.0":
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-29.5.0.tgz#d4d09ec3286b3d90c60bdcd66ed28d35f1b4dc2c"
+  integrity sha512-9ARvuAAQcBwDAqOnglWq2zwNIRUDtk/SCkp/ToGEhFv5r86K21l+VEs0qNTaXtyiY0lEePl3kylijSYJQqdbDg==
+  dependencies:
+    "@jest/types" "^29.5.0"
+    "@sinonjs/fake-timers" "^10.0.2"
+    "@types/node" "*"
+    jest-message-util "^29.5.0"
+    jest-mock "^29.5.0"
+    jest-util "^29.5.0"
+
 "@jest/globals@^27.5.1":
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-27.5.1.tgz#7ac06ce57ab966566c7963431cef458434601b2b"
@@ -2200,6 +3369,16 @@
     "@jest/types" "^27.5.1"
     expect "^27.5.1"
 
+"@jest/globals@^29.5.0":
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-29.5.0.tgz#6166c0bfc374c58268677539d0c181f9c1833298"
+  integrity sha512-S02y0qMWGihdzNbUiqSAiKSpSozSuHX5UYc7QbnHP+D9Lyw8DgGGCinrN9uSuHPeKgSSzvPom2q1nAtBvUsvPQ==
+  dependencies:
+    "@jest/environment" "^29.5.0"
+    "@jest/expect" "^29.5.0"
+    "@jest/types" "^29.5.0"
+    jest-mock "^29.5.0"
+
 "@jest/reporters@^27.5.1":
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-27.5.1.tgz#ceda7be96170b03c923c37987b64015812ffec04"
@@ -2231,6 +3410,36 @@
     terminal-link "^2.0.0"
     v8-to-istanbul "^8.1.0"
 
+"@jest/reporters@^29.4.1", "@jest/reporters@^29.5.0":
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-29.5.0.tgz#985dfd91290cd78ddae4914ba7921bcbabe8ac9b"
+  integrity sha512-D05STXqj/M8bP9hQNSICtPqz97u7ffGzZu+9XLucXhkOFBqKcXe04JLZOgIekOxdb73MAoBUFnqvf7MCpKk5OA==
+  dependencies:
+    "@bcoe/v8-coverage" "^0.2.3"
+    "@jest/console" "^29.5.0"
+    "@jest/test-result" "^29.5.0"
+    "@jest/transform" "^29.5.0"
+    "@jest/types" "^29.5.0"
+    "@jridgewell/trace-mapping" "^0.3.15"
+    "@types/node" "*"
+    chalk "^4.0.0"
+    collect-v8-coverage "^1.0.0"
+    exit "^0.1.2"
+    glob "^7.1.3"
+    graceful-fs "^4.2.9"
+    istanbul-lib-coverage "^3.0.0"
+    istanbul-lib-instrument "^5.1.0"
+    istanbul-lib-report "^3.0.0"
+    istanbul-lib-source-maps "^4.0.0"
+    istanbul-reports "^3.1.3"
+    jest-message-util "^29.5.0"
+    jest-util "^29.5.0"
+    jest-worker "^29.5.0"
+    slash "^3.0.0"
+    string-length "^4.0.1"
+    strip-ansi "^6.0.0"
+    v8-to-istanbul "^9.0.1"
+
 "@jest/schemas@^28.1.3":
   version "28.1.3"
   resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-28.1.3.tgz#ad8b86a66f11f33619e3d7e1dcddd7f2d40ff905"
@@ -2245,6 +3454,13 @@
   dependencies:
     "@sinclair/typebox" "^0.24.1"
 
+"@jest/schemas@^29.4.3":
+  version "29.4.3"
+  resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.4.3.tgz#39cf1b8469afc40b6f5a2baaa146e332c4151788"
+  integrity sha512-VLYKXQmtmuEz6IxJsrZwzG9NvtkQsWNnWMsKxqWNu3+CnfzJQhp0WDDKWLVV9hLKr0l3SLLFRqcYHjhtyuDVxg==
+  dependencies:
+    "@sinclair/typebox" "^0.25.16"
+
 "@jest/source-map@^27.5.1":
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-27.5.1.tgz#6608391e465add4205eae073b55e7f279e04e8cf"
@@ -2254,6 +3470,15 @@
     graceful-fs "^4.2.9"
     source-map "^0.6.0"
 
+"@jest/source-map@^29.4.3":
+  version "29.4.3"
+  resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-29.4.3.tgz#ff8d05cbfff875d4a791ab679b4333df47951d20"
+  integrity sha512-qyt/mb6rLyd9j1jUts4EQncvS6Yy3PM9HghnNv86QBlV+zdL2inCdK1tuVlL+J+lpiw2BI67qXOrX3UurBqQ1w==
+  dependencies:
+    "@jridgewell/trace-mapping" "^0.3.15"
+    callsites "^3.0.0"
+    graceful-fs "^4.2.9"
+
 "@jest/test-result@^27.5.1":
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-27.5.1.tgz#56a6585fa80f7cdab72b8c5fc2e871d03832f5bb"
@@ -2274,6 +3499,16 @@
     "@types/istanbul-lib-coverage" "^2.0.0"
     collect-v8-coverage "^1.0.0"
 
+"@jest/test-result@^29.4.1", "@jest/test-result@^29.5.0":
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-29.5.0.tgz#7c856a6ca84f45cc36926a4e9c6b57f1973f1408"
+  integrity sha512-fGl4rfitnbfLsrfx1uUpDEESS7zM8JdgZgOCQuxQvL1Sn/I6ijeAVQWGfXI9zb1i9Mzo495cIpVZhA0yr60PkQ==
+  dependencies:
+    "@jest/console" "^29.5.0"
+    "@jest/types" "^29.5.0"
+    "@types/istanbul-lib-coverage" "^2.0.0"
+    collect-v8-coverage "^1.0.0"
+
 "@jest/test-sequencer@^27.5.1":
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-27.5.1.tgz#4057e0e9cea4439e544c6353c6affe58d095745b"
@@ -2284,6 +3519,16 @@
     jest-haste-map "^27.5.1"
     jest-runtime "^27.5.1"
 
+"@jest/test-sequencer@^29.5.0":
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-29.5.0.tgz#34d7d82d3081abd523dbddc038a3ddcb9f6d3cc4"
+  integrity sha512-yPafQEcKjkSfDXyvtgiV4pevSeyuA6MQr6ZIdVkWJly9vkqjnFfcfhRQqpD5whjoU8EORki752xQmjaqoFjzMQ==
+  dependencies:
+    "@jest/test-result" "^29.5.0"
+    graceful-fs "^4.2.9"
+    jest-haste-map "^29.5.0"
+    slash "^3.0.0"
+
 "@jest/transform@^27.5.1":
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-27.5.1.tgz#6c3501dcc00c4c08915f292a600ece5ecfe1f409"
@@ -2305,6 +3550,27 @@
     source-map "^0.6.1"
     write-file-atomic "^3.0.0"
 
+"@jest/transform@^29.5.0":
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-29.5.0.tgz#cf9c872d0965f0cbd32f1458aa44a2b1988b00f9"
+  integrity sha512-8vbeZWqLJOvHaDfeMuoHITGKSz5qWc9u04lnWrQE3VyuSw604PzQM824ZeX9XSjUCeDiE3GuxZe5UKa8J61NQw==
+  dependencies:
+    "@babel/core" "^7.11.6"
+    "@jest/types" "^29.5.0"
+    "@jridgewell/trace-mapping" "^0.3.15"
+    babel-plugin-istanbul "^6.1.1"
+    chalk "^4.0.0"
+    convert-source-map "^2.0.0"
+    fast-json-stable-stringify "^2.1.0"
+    graceful-fs "^4.2.9"
+    jest-haste-map "^29.5.0"
+    jest-regex-util "^29.4.3"
+    jest-util "^29.5.0"
+    micromatch "^4.0.4"
+    pirates "^4.0.4"
+    slash "^3.0.0"
+    write-file-atomic "^4.0.2"
+
 "@jest/types@^26.6.2":
   version "26.6.2"
   resolved "https://registry.yarnpkg.com/@jest/types/-/types-26.6.2.tgz#bef5a532030e1d88a2f5a6d933f84e97226ed48e"
@@ -2351,6 +3617,18 @@
     "@types/yargs" "^17.0.8"
     chalk "^4.0.0"
 
+"@jest/types@^29.5.0":
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.5.0.tgz#f59ef9b031ced83047c67032700d8c807d6e1593"
+  integrity sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==
+  dependencies:
+    "@jest/schemas" "^29.4.3"
+    "@types/istanbul-lib-coverage" "^2.0.0"
+    "@types/istanbul-reports" "^3.0.0"
+    "@types/node" "*"
+    "@types/yargs" "^17.0.8"
+    chalk "^4.0.0"
+
 "@jimp/bmp@^0.16.2":
   version "0.16.2"
   resolved "https://registry.yarnpkg.com/@jimp/bmp/-/bmp-0.16.2.tgz#3982879b10626fc8cf1b4ab8627158bad142ec9d"
@@ -2490,6 +3768,11 @@
   resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24"
   integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==
 
+"@jridgewell/sourcemap-codec@^1.4.13":
+  version "1.4.15"
+  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32"
+  integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==
+
 "@jridgewell/trace-mapping@0.3.9":
   version "0.3.9"
   resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz#6534fd5933a53ba7cbf3a17615e273a0d1273ff9"
@@ -2498,6 +3781,14 @@
     "@jridgewell/resolve-uri" "^3.0.3"
     "@jridgewell/sourcemap-codec" "^1.4.10"
 
+"@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.15", "@jridgewell/trace-mapping@^0.3.17":
+  version "0.3.18"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz#25783b2086daf6ff1dcb53c9249ae480e4dd4cd6"
+  integrity sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==
+  dependencies:
+    "@jridgewell/resolve-uri" "3.1.0"
+    "@jridgewell/sourcemap-codec" "1.4.14"
+
 "@jridgewell/trace-mapping@^0.3.14", "@jridgewell/trace-mapping@^0.3.9":
   version "0.3.17"
   resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz#793041277af9073b0951a7fe0f0d8c4c98c36985"
@@ -2677,6 +3968,48 @@
   resolved "https://registry.yarnpkg.com/@metamask/safe-event-emitter/-/safe-event-emitter-2.0.0.tgz#af577b477c683fad17c619a78208cede06f9605c"
   integrity sha512-/kSXhY692qiV1MXu6EeOZvg5nECLclxNXcKCxJ3cXQgYuRymRHpdx/t7JXfsK+JLjwA1e1c1/SBrlQYpusC29Q==
 
+"@microsoft/api-extractor-model@7.27.3":
+  version "7.27.3"
+  resolved "https://registry.yarnpkg.com/@microsoft/api-extractor-model/-/api-extractor-model-7.27.3.tgz#a484e0b7e25c4fa85846281aed6b87da0411d96c"
+  integrity sha512-fSFvw7otYHduOkyshjTbapKKgwF8bgquVHvgF8VgeKtMYvqXkoaj7W6VcM7PNY7E2bbblhUgC4XNdqZLD4SJGw==
+  dependencies:
+    "@microsoft/tsdoc" "0.14.2"
+    "@microsoft/tsdoc-config" "~0.16.1"
+    "@rushstack/node-core-library" "3.59.4"
+
+"@microsoft/api-extractor@^7.33.5":
+  version "7.35.4"
+  resolved "https://registry.yarnpkg.com/@microsoft/api-extractor/-/api-extractor-7.35.4.tgz#87478e1e52dcae7f5e7760e870a9a07e9e4292f1"
+  integrity sha512-E/DIIlgu1ZW+AD+Y0UuVe/30rO+Km0CRkDU1aOKQntwKtv/+FodtRAUvzU/vAxq5lQHSsy6jJErLiXR6G3fupA==
+  dependencies:
+    "@microsoft/api-extractor-model" "7.27.3"
+    "@microsoft/tsdoc" "0.14.2"
+    "@microsoft/tsdoc-config" "~0.16.1"
+    "@rushstack/node-core-library" "3.59.4"
+    "@rushstack/rig-package" "0.3.21"
+    "@rushstack/ts-command-line" "4.15.1"
+    colors "~1.2.1"
+    lodash "~4.17.15"
+    resolve "~1.22.1"
+    semver "~7.3.0"
+    source-map "~0.6.1"
+    typescript "~5.0.4"
+
+"@microsoft/tsdoc-config@~0.16.1":
+  version "0.16.2"
+  resolved "https://registry.yarnpkg.com/@microsoft/tsdoc-config/-/tsdoc-config-0.16.2.tgz#b786bb4ead00d54f53839a458ce626c8548d3adf"
+  integrity sha512-OGiIzzoBLgWWR0UdRJX98oYO+XKGf7tiK4Zk6tQ/E4IJqGCe7dvkTvgDZV5cFJUzLGDOjeAXrnZoA6QkVySuxw==
+  dependencies:
+    "@microsoft/tsdoc" "0.14.2"
+    ajv "~6.12.6"
+    jju "~1.4.0"
+    resolve "~1.19.0"
+
+"@microsoft/tsdoc@0.14.2":
+  version "0.14.2"
+  resolved "https://registry.yarnpkg.com/@microsoft/tsdoc/-/tsdoc-0.14.2.tgz#c3ec604a0b54b9a9b87e9735dfc59e1a5da6a5fb"
+  integrity sha512-9b8mPpKrfeGRuhFH5iO1iwCLeIIsV6+H1sRfxbkoGXIyQE2BTsPd9zqSqQJ+pv5sJ/hT5M1zvOFL02MnEezFug==
+
 "@multiformats/base-x@^4.0.1":
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/@multiformats/base-x/-/base-x-4.0.1.tgz#95ff0fa58711789d53aefb2590a8b7a4e715d121"
@@ -2725,6 +4058,41 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
+"@nrwl/devkit@16.3.2":
+  version "16.3.2"
+  resolved "https://registry.yarnpkg.com/@nrwl/devkit/-/devkit-16.3.2.tgz#b45393dfd62dcb75554ff0c2dff6715a907e3877"
+  integrity sha512-EiDwVIvh6AcClXv22Q7auQh7Iy/ONISEFWzTswy/J6ZmVGCQesbiwg4cGV0MKiScr+awdVzqyNey+wD6IR5Lkw==
+  dependencies:
+    "@nx/devkit" "16.3.2"
+
+"@nrwl/eslint-plugin-nx@16.3.2":
+  version "16.3.2"
+  resolved "https://registry.yarnpkg.com/@nrwl/eslint-plugin-nx/-/eslint-plugin-nx-16.3.2.tgz#575e634dd19ea9e13f89b1f63bab300b53cf1bea"
+  integrity sha512-E+X/L8b/GtbAGnwm+WOdAlXNwNYCTb6uodo5yxRrUkkMoVVMkzI7FLOHKGgYiqXH/xbuKE3yAg21EwP0epOi2Q==
+  dependencies:
+    "@nx/eslint-plugin" "16.3.2"
+
+"@nrwl/jest@16.3.2":
+  version "16.3.2"
+  resolved "https://registry.yarnpkg.com/@nrwl/jest/-/jest-16.3.2.tgz#5e7a3cd23861d7aa31b52262e6dabc6ee2fa9206"
+  integrity sha512-vhwrgjIn1XG3zDSlc6CSfCKBtgDEYQUWG69MdfaqrNInmmsiPkspv7eM99Xh8MGN5HMC2Epzy2todD3J2zZZuQ==
+  dependencies:
+    "@nx/jest" "16.3.2"
+
+"@nrwl/js@16.3.2":
+  version "16.3.2"
+  resolved "https://registry.yarnpkg.com/@nrwl/js/-/js-16.3.2.tgz#60268ebbb08a82ea3c1ce29b89a58bfbb96ccddd"
+  integrity sha512-UMmdA4vXy2/VWNMlpBDruT9XwGmLw/MpUaKoN2KLkai/fYN6MvB3mabc9WQ8qsNvDWshmOJ6TqAHReR25BjugQ==
+  dependencies:
+    "@nx/js" "16.3.2"
+
+"@nrwl/linter@16.3.2":
+  version "16.3.2"
+  resolved "https://registry.yarnpkg.com/@nrwl/linter/-/linter-16.3.2.tgz#b99eabfceab16dc404415d0d87fa3e380b6f859f"
+  integrity sha512-sUDQNlmRIGQnhdDmpQkJgpF9LZWKBoqXr2g9Y4yq0QlpTamxTbx8/GxMICotA52kayEx1cKbU1xvjJWPchSrlw==
+  dependencies:
+    "@nx/linter" "16.3.2"
+
 "@nrwl/nx-cloud@16.0.5":
   version "16.0.5"
   resolved "https://registry.yarnpkg.com/@nrwl/nx-cloud/-/nx-cloud-16.0.5.tgz#c963480a71c4afa964fbbe9e4d6bbf222764e9cd"
@@ -2732,6 +4100,13 @@
   dependencies:
     nx-cloud "16.0.5"
 
+"@nrwl/react@16.3.2":
+  version "16.3.2"
+  resolved "https://registry.yarnpkg.com/@nrwl/react/-/react-16.3.2.tgz#69387a4b8a555fa07f4bd6f70fbb0a40d841df8c"
+  integrity sha512-p9Y2pWgUnVOUB5wMiE9iIKCV6CzixSPc6p5GQIP8ysbtVdV7WZ9bNFiuR9pxNQ9Y6weJsMH9lr45pZ7G7JO4KA==
+  dependencies:
+    "@nx/react" "16.3.2"
+
 "@nrwl/tao@16.3.2":
   version "16.3.2"
   resolved "https://registry.yarnpkg.com/@nrwl/tao/-/tao-16.3.2.tgz#eefc1974342afbbe48e4e5351d6707ad2f9fb179"
@@ -2739,6 +4114,114 @@
   dependencies:
     nx "16.3.2"
 
+"@nrwl/vite@16.3.2":
+  version "16.3.2"
+  resolved "https://registry.yarnpkg.com/@nrwl/vite/-/vite-16.3.2.tgz#37f3ea458f12e2c533be0e6dffd6cc502f7e1644"
+  integrity sha512-EK9lR/tpBDSxSVG9E4o4VMioUJQ9hm1wMUghwWgLaMXM4S1iTT/CwA2NdLOGbTx8QxKm6t1odWGosOU3NhoohA==
+  dependencies:
+    "@nx/vite" "16.3.2"
+
+"@nrwl/web@16.3.2":
+  version "16.3.2"
+  resolved "https://registry.yarnpkg.com/@nrwl/web/-/web-16.3.2.tgz#0ab518b1f8042937250cac4a2f47618837969af8"
+  integrity sha512-UJotencL5g+jyozfVPLevbzWoR10Mx/AURzGNzzGmddLbmXJlsHwnnKHtzGzc+QFG10jYMzk1WZSyBo/ZPrN+Q==
+  dependencies:
+    "@nx/web" "16.3.2"
+
+"@nrwl/workspace@16.3.2":
+  version "16.3.2"
+  resolved "https://registry.yarnpkg.com/@nrwl/workspace/-/workspace-16.3.2.tgz#3d3921dc9288fb6a9dfd8f1b05ca16b46930cdac"
+  integrity sha512-ORVzEEJIMOFYEOtOQHLU7N4vT4mYZ/JzKiwHZrHkCaVhgkiGBLoX3tOwVZjafKaa/24cGISv0J7WRtnfRKl2cA==
+  dependencies:
+    "@nx/workspace" "16.3.2"
+
+"@nx/devkit@16.3.2":
+  version "16.3.2"
+  resolved "https://registry.yarnpkg.com/@nx/devkit/-/devkit-16.3.2.tgz#95d58d104449c54bdc276fa1c9166fcad867cfa8"
+  integrity sha512-1ev3EDm2Sx/ibziZroL1SheqxDR7UgC49tkBgJz1GrQLQnfdhBYroCPSyBSWGPMLHjIuHb3+hyGSV1Bz+BIYOA==
+  dependencies:
+    "@nrwl/devkit" "16.3.2"
+    ejs "^3.1.7"
+    ignore "^5.0.4"
+    semver "7.3.4"
+    tmp "~0.2.1"
+    tslib "^2.3.0"
+
+"@nx/eslint-plugin@16.3.2", "@nx/eslint-plugin@^16.3.2":
+  version "16.3.2"
+  resolved "https://registry.yarnpkg.com/@nx/eslint-plugin/-/eslint-plugin-16.3.2.tgz#085ea6a71003f4780ef52f13dd1f83133adc1280"
+  integrity sha512-9KMiDEvsHPlLm9wrG3qUl68veNFLbFglD5XGKmBXA07tHISWo5eqNIML5/Y5cwsRufUcQFe21V+6FxrbVQ24CQ==
+  dependencies:
+    "@nrwl/eslint-plugin-nx" "16.3.2"
+    "@nx/devkit" "16.3.2"
+    "@nx/js" "16.3.2"
+    "@typescript-eslint/type-utils" "^5.58.0"
+    "@typescript-eslint/utils" "^5.58.0"
+    chalk "^4.1.0"
+    confusing-browser-globals "^1.0.9"
+    semver "7.3.4"
+
+"@nx/jest@16.3.2":
+  version "16.3.2"
+  resolved "https://registry.yarnpkg.com/@nx/jest/-/jest-16.3.2.tgz#809297cb4aa45e277e8a57684e93f3953bb4bea5"
+  integrity sha512-aO8Rc+wwSXLh1jJYd2cxOT5R9BQfqjAXWZOPcvAQQonFNNfwMHrw0+YsqjWgiFtFrxzSX5RrhzVG44cOWpAdqQ==
+  dependencies:
+    "@jest/reporters" "^29.4.1"
+    "@jest/test-result" "^29.4.1"
+    "@nrwl/jest" "16.3.2"
+    "@nx/devkit" "16.3.2"
+    "@nx/js" "16.3.2"
+    "@phenomnomnominal/tsquery" "~5.0.1"
+    chalk "^4.1.0"
+    dotenv "~10.0.0"
+    identity-obj-proxy "3.0.0"
+    jest-config "^29.4.1"
+    jest-resolve "^29.4.1"
+    jest-util "^29.4.1"
+    resolve.exports "1.1.0"
+    tslib "^2.3.0"
+
+"@nx/js@16.3.2":
+  version "16.3.2"
+  resolved "https://registry.yarnpkg.com/@nx/js/-/js-16.3.2.tgz#1f2e6807439bfb525f24f983558e7b054d57c3f2"
+  integrity sha512-bumLGMduNm221Sh3/wkEMEkJOC1kTlqmpx6wamDSsPlAFq0ePgoaNJjoYqC9XH7n7wXtgy9bgKhHJPnek8NKow==
+  dependencies:
+    "@babel/core" "^7.15.0"
+    "@babel/plugin-proposal-class-properties" "^7.14.5"
+    "@babel/plugin-proposal-decorators" "^7.14.5"
+    "@babel/plugin-transform-runtime" "^7.15.0"
+    "@babel/preset-env" "^7.15.0"
+    "@babel/preset-typescript" "^7.15.0"
+    "@babel/runtime" "^7.14.8"
+    "@nrwl/js" "16.3.2"
+    "@nx/devkit" "16.3.2"
+    "@nx/workspace" "16.3.2"
+    "@phenomnomnominal/tsquery" "~5.0.1"
+    babel-plugin-const-enum "^1.0.1"
+    babel-plugin-macros "^2.8.0"
+    babel-plugin-transform-typescript-metadata "^0.3.1"
+    chalk "^4.1.0"
+    fast-glob "3.2.7"
+    fs-extra "^11.1.0"
+    ignore "^5.0.4"
+    js-tokens "^4.0.0"
+    minimatch "3.0.5"
+    semver "7.3.4"
+    source-map-support "0.5.19"
+    tslib "^2.3.0"
+
+"@nx/linter@16.3.2":
+  version "16.3.2"
+  resolved "https://registry.yarnpkg.com/@nx/linter/-/linter-16.3.2.tgz#85411007f9d64f2723f532735f96d1a17480e2e1"
+  integrity sha512-hVCU6ZIMd+yTMLrC3PbjaHuD3yU+sB/lABTaWuUx2klT0cqKhiTp0KnDLcFWtzQmnNtGEaUjfPKxvA92xon0CA==
+  dependencies:
+    "@nrwl/linter" "16.3.2"
+    "@nx/devkit" "16.3.2"
+    "@nx/js" "16.3.2"
+    "@phenomnomnominal/tsquery" "~5.0.1"
+    tmp "~0.2.1"
+    tslib "^2.3.0"
+
 "@nx/nx-darwin-arm64@16.3.2":
   version "16.3.2"
   resolved "https://registry.yarnpkg.com/@nx/nx-darwin-arm64/-/nx-darwin-arm64-16.3.2.tgz#83b6e78b27d2d7da8f7626560f52070c8735d28a"
@@ -2789,6 +4272,76 @@
   resolved "https://registry.yarnpkg.com/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-16.3.2.tgz#2195faaf1fc465c7a89bfdd62323fdd2a5d91f15"
   integrity sha512-QC0sWrfQm0/WdvvM//7UAgm+otbak6bznZ0zawTeqmLBh1hLjNeweyzSVKQEtZtlzDMKpzCVuuwkJq+VKBLvmw==
 
+"@nx/react@16.3.2", "@nx/react@^16.3.2":
+  version "16.3.2"
+  resolved "https://registry.yarnpkg.com/@nx/react/-/react-16.3.2.tgz#43e880f20481373d9264ef67f3e6dadb467212b1"
+  integrity sha512-Maj2zva2nUlsGP5o5SDEsNErIiDK247EqXraTnLPUEQy8XQP2oOThu5FkKhT51RguLyRDFtFei4vANPl/WI6FQ==
+  dependencies:
+    "@nrwl/react" "16.3.2"
+    "@nx/devkit" "16.3.2"
+    "@nx/js" "16.3.2"
+    "@nx/linter" "16.3.2"
+    "@nx/web" "16.3.2"
+    "@phenomnomnominal/tsquery" "~5.0.1"
+    "@svgr/webpack" "^8.0.1"
+    chalk "^4.1.0"
+    file-loader "^6.2.0"
+    minimatch "3.0.5"
+
+"@nx/vite@16.3.2":
+  version "16.3.2"
+  resolved "https://registry.yarnpkg.com/@nx/vite/-/vite-16.3.2.tgz#28327c4d317f36a9fa85c56df3ee1b69b81c8731"
+  integrity sha512-3xbWsFdssfJqeqX3qOWxCZnrsi2ZrdUgnAMzdfp983hjzBzz28Wp/d9QGW+2GgCX3jhnxxYrh11oSSHsChUxWg==
+  dependencies:
+    "@nrwl/vite" "16.3.2"
+    "@nx/devkit" "16.3.2"
+    "@nx/js" "16.3.2"
+    "@phenomnomnominal/tsquery" "~5.0.1"
+    "@swc/helpers" "~0.5.0"
+    dotenv "~10.0.0"
+    enquirer "~2.3.6"
+
+"@nx/web@16.3.2":
+  version "16.3.2"
+  resolved "https://registry.yarnpkg.com/@nx/web/-/web-16.3.2.tgz#73a9630b28f17640f7c80a221837c95057445116"
+  integrity sha512-PzTkawQ+OgjX0mR5KwMGcdveoMNLKo/jYaW3UrPMIVUy0NpalW0ULJnDOUt+NRlrp7jOsUP7hUYZkYPNDI3Ivg==
+  dependencies:
+    "@nrwl/web" "16.3.2"
+    "@nx/devkit" "16.3.2"
+    "@nx/js" "16.3.2"
+    chalk "^4.1.0"
+    chokidar "^3.5.1"
+    detect-port "^1.5.1"
+    http-server "^14.1.0"
+    ignore "^5.0.4"
+    tslib "^2.3.0"
+
+"@nx/workspace@16.3.2":
+  version "16.3.2"
+  resolved "https://registry.yarnpkg.com/@nx/workspace/-/workspace-16.3.2.tgz#145d4ee7b909d5b430d7ac9a8043d688a00d017c"
+  integrity sha512-gFrJEv3+Jn2leu3RKFTakPHY8okI8hjOg8RO4OWA2ZemFXRyh9oIm/xsCsOyqYlGt06eqV2mD3GUun/05z1nhg==
+  dependencies:
+    "@nrwl/workspace" "16.3.2"
+    "@nx/devkit" "16.3.2"
+    "@parcel/watcher" "2.0.4"
+    chalk "^4.1.0"
+    chokidar "^3.5.1"
+    cli-cursor "3.1.0"
+    cli-spinners "2.6.1"
+    dotenv "~10.0.0"
+    figures "3.2.0"
+    flat "^5.0.2"
+    ignore "^5.0.4"
+    minimatch "3.0.5"
+    npm-run-path "^4.0.1"
+    nx "16.3.2"
+    open "^8.4.0"
+    rxjs "^7.8.0"
+    tmp "~0.2.1"
+    tslib "^2.3.0"
+    yargs "^17.6.2"
+    yargs-parser "21.1.1"
+
 "@openzeppelin/contracts@3.4.1-solc-0.7-2":
   version "3.4.1-solc-0.7-2"
   resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-3.4.1-solc-0.7-2.tgz#371c67ebffe50f551c3146a9eec5fe6ffe862e92"
@@ -2812,6 +4365,13 @@
   resolved "https://registry.yarnpkg.com/@pedrouid/environment/-/environment-1.0.1.tgz#858f0f8a057340e0b250398b75ead77d6f4342ec"
   integrity sha512-HaW78NszGzRZd9SeoI3JD11JqY+lubnaOx7Pewj5pfjqWXOEATpeKIFb9Z4t2WBUK2iryiXX3lzWwmYWgUL0Ug==
 
+"@phenomnomnominal/tsquery@~5.0.1":
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/@phenomnomnominal/tsquery/-/tsquery-5.0.1.tgz#a2a5abc89f92c01562a32806655817516653a388"
+  integrity sha512-3nVv+e2FQwsW8Aw6qTU6f+1rfcJ3hrcnvH/mu9i8YhxO+9sqbOfpL8m6PbET5+xKOlz/VSbp0RoYWYCtIsnmuA==
+  dependencies:
+    esquery "^1.4.0"
+
 "@pmmmwh/react-refresh-webpack-plugin@^0.5.3":
   version "0.5.10"
   resolved "https://registry.yarnpkg.com/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.5.10.tgz#2eba163b8e7dbabb4ce3609ab5e32ab63dda3ef8"
@@ -3100,11 +4660,59 @@
     estree-walker "^1.0.1"
     picomatch "^2.2.2"
 
+"@rollup/pluginutils@^4.2.1":
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-4.2.1.tgz#e6c6c3aba0744edce3fb2074922d3776c0af2a6d"
+  integrity sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ==
+  dependencies:
+    estree-walker "^2.0.1"
+    picomatch "^2.2.2"
+
+"@rollup/pluginutils@^5.0.2":
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-5.0.2.tgz#012b8f53c71e4f6f9cb317e311df1404f56e7a33"
+  integrity sha512-pTd9rIsP92h+B6wWwFbW8RkZv4hiR/xKsqre4SIuAOaOEQRxi0lqLke9k2/7WegC85GgUs9pjmOjCUi3In4vwA==
+  dependencies:
+    "@types/estree" "^1.0.0"
+    estree-walker "^2.0.2"
+    picomatch "^2.3.1"
+
 "@rushstack/eslint-patch@^1.1.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@rushstack/eslint-patch/-/eslint-patch-1.2.0.tgz#8be36a1f66f3265389e90b5f9c9962146758f728"
   integrity sha512-sXo/qW2/pAcmT43VoRKOJbDOfV3cYpq3szSVfIThQXNt+E4DfKj361vaAt3c88U5tPUxzEswam7GW48PJqtKAg==
 
+"@rushstack/node-core-library@3.59.4", "@rushstack/node-core-library@^3.53.2":
+  version "3.59.4"
+  resolved "https://registry.yarnpkg.com/@rushstack/node-core-library/-/node-core-library-3.59.4.tgz#95f9eb3274627a5e84ee9443e65bb6edec1a5dc8"
+  integrity sha512-YAKJDC6Mz/KA1D7bvB88WaRX3knt/ZuLzkRu5G9QADGSjLtvTWzCNCytRF2PCSaaHOZaZsWul4F1KQdgFgUDqA==
+  dependencies:
+    colors "~1.2.1"
+    fs-extra "~7.0.1"
+    import-lazy "~4.0.0"
+    jju "~1.4.0"
+    resolve "~1.22.1"
+    semver "~7.3.0"
+    z-schema "~5.0.2"
+
+"@rushstack/rig-package@0.3.21":
+  version "0.3.21"
+  resolved "https://registry.yarnpkg.com/@rushstack/rig-package/-/rig-package-0.3.21.tgz#5bd48c2a890f7d892c40fa1780f98af29c8140a4"
+  integrity sha512-6KPBuZYP/b9U0Qwy1J4vjYtXvLavdmVT7mMelErfqqZ3P/ywoxlFITGr9ZbqD1zmfIVrIfC2jrM6gfm7OHPRhQ==
+  dependencies:
+    resolve "~1.22.1"
+    strip-json-comments "~3.1.1"
+
+"@rushstack/ts-command-line@4.15.1":
+  version "4.15.1"
+  resolved "https://registry.yarnpkg.com/@rushstack/ts-command-line/-/ts-command-line-4.15.1.tgz#8f2ebde6bb19deb2c5b65363854b84aea1bf59f0"
+  integrity sha512-EL4jxZe5fhb1uVL/P/wQO+Z8Rc8FMiWJ1G7VgnPDvdIt5GVjRfK7vwzder1CZQiX3x0PY6uxENYLNGTFd1InRQ==
+  dependencies:
+    "@types/argparse" "1.0.38"
+    argparse "~1.0.9"
+    colors "~1.2.1"
+    string-argv "~0.3.1"
+
 "@safe-global/api-kit@^1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@safe-global/api-kit/-/api-kit-1.0.1.tgz#7176024cfeacccbf5a383e49f5b37d25cca97efc"
@@ -3279,6 +4887,23 @@
     "@sentry/cli" "^1.74.6"
     webpack-sources "^2.0.0 || ^3.0.0"
 
+"@sideway/address@^4.1.3":
+  version "4.1.4"
+  resolved "https://registry.yarnpkg.com/@sideway/address/-/address-4.1.4.tgz#03dccebc6ea47fdc226f7d3d1ad512955d4783f0"
+  integrity sha512-7vwq+rOHVWjyXxVlR76Agnvhy8I9rpzjosTESvmhNeXOXdZZB15Fl+TI9x1SiHZH5Jv2wTGduSxFDIaq0m3DUw==
+  dependencies:
+    "@hapi/hoek" "^9.0.0"
+
+"@sideway/formula@^3.0.1":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@sideway/formula/-/formula-3.0.1.tgz#80fcbcbaf7ce031e0ef2dd29b1bfc7c3f583611f"
+  integrity sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg==
+
+"@sideway/pinpoint@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@sideway/pinpoint/-/pinpoint-2.0.0.tgz#cff8ffadc372ad29fd3f78277aeb29e632cc70df"
+  integrity sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==
+
 "@simbathesailor/babel-plugin-use-what-changed@^2.1.0":
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/@simbathesailor/babel-plugin-use-what-changed/-/babel-plugin-use-what-changed-2.1.0.tgz#2f64a1bedcb7652a72ff7f84cb8f2df297ec9f5f"
@@ -3298,6 +4923,11 @@
   resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.24.51.tgz#645f33fe4e02defe26f2f5c0410e1c094eac7f5f"
   integrity sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==
 
+"@sinclair/typebox@^0.25.16":
+  version "0.25.24"
+  resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.25.24.tgz#8c7688559979f7079aacaf31aa881c3aa410b718"
+  integrity sha512-XJfwUVUKDHF5ugKwIcxEgc9k8b7HbznCp6eUfWgu710hMPNIO4aw4/zB5RogDQz8nd6gyCDpU9O/m6qYEWY6yQ==
+
 "@sindresorhus/is@^0.14.0":
   version "0.14.0"
   resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea"
@@ -3315,6 +4945,20 @@
   dependencies:
     type-detect "4.0.8"
 
+"@sinonjs/commons@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-3.0.0.tgz#beb434fe875d965265e04722ccfc21df7f755d72"
+  integrity sha512-jXBtWAF4vmdNmZgD5FoKsVLv3rPgDnLgPbU84LIJ3otV44vJlDRokVng5v8NFJdCf/da9legHcKaRuZs4L7faA==
+  dependencies:
+    type-detect "4.0.8"
+
+"@sinonjs/fake-timers@^10.0.2":
+  version "10.2.0"
+  resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-10.2.0.tgz#b3e322a34c5f26e3184e7f6115695f299c1b1194"
+  integrity sha512-OPwQlEdg40HAj5KNF8WW6q2KG4Z+cBCZb3m4ninfTZKaBmbIJodviQsDBoYMPHkOyJJMHnOJo5j2+LKDOhOACg==
+  dependencies:
+    "@sinonjs/commons" "^3.0.0"
+
 "@sinonjs/fake-timers@^8.0.1":
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz#3fdc2b6cb58935b21bfb8d1625eb1300484316e7"
@@ -3612,46 +5256,100 @@
     magic-string "^0.25.0"
     string.prototype.matchall "^4.0.6"
 
+"@svgr/babel-plugin-add-jsx-attribute@8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-8.0.0.tgz#4001f5d5dd87fa13303e36ee106e3ff3a7eb8b22"
+  integrity sha512-b9MIk7yhdS1pMCZM8VeNfUlSKVRhsHZNMl5O9SfaX0l0t5wjdgu4IDzGB8bpnGBBOjGST3rRFVsaaEtI4W6f7g==
+
 "@svgr/babel-plugin-add-jsx-attribute@^5.4.0":
   version "5.4.0"
   resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-5.4.0.tgz#81ef61947bb268eb9d50523446f9c638fb355906"
   integrity sha512-ZFf2gs/8/6B8PnSofI0inYXr2SDNTDScPXhN7k5EqD4aZ3gi6u+rbmZHVB8IM3wDyx8ntKACZbtXSm7oZGRqVg==
 
+"@svgr/babel-plugin-remove-jsx-attribute@8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-remove-jsx-attribute/-/babel-plugin-remove-jsx-attribute-8.0.0.tgz#69177f7937233caca3a1afb051906698f2f59186"
+  integrity sha512-BcCkm/STipKvbCl6b7QFrMh/vx00vIP63k2eM66MfHJzPr6O2U0jYEViXkHJWqXqQYjdeA9cuCl5KWmlwjDvbA==
+
 "@svgr/babel-plugin-remove-jsx-attribute@^5.4.0":
   version "5.4.0"
   resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-remove-jsx-attribute/-/babel-plugin-remove-jsx-attribute-5.4.0.tgz#6b2c770c95c874654fd5e1d5ef475b78a0a962ef"
   integrity sha512-yaS4o2PgUtwLFGTKbsiAy6D0o3ugcUhWK0Z45umJ66EPWunAz9fuFw2gJuje6wqQvQWOTJvIahUwndOXb7QCPg==
 
+"@svgr/babel-plugin-remove-jsx-empty-expression@8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-remove-jsx-empty-expression/-/babel-plugin-remove-jsx-empty-expression-8.0.0.tgz#c2c48104cfd7dcd557f373b70a56e9e3bdae1d44"
+  integrity sha512-5BcGCBfBxB5+XSDSWnhTThfI9jcO5f0Ai2V24gZpG+wXF14BzwxxdDb4g6trdOux0rhibGs385BeFMSmxtS3uA==
+
 "@svgr/babel-plugin-remove-jsx-empty-expression@^5.0.1":
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-remove-jsx-empty-expression/-/babel-plugin-remove-jsx-empty-expression-5.0.1.tgz#25621a8915ed7ad70da6cea3d0a6dbc2ea933efd"
   integrity sha512-LA72+88A11ND/yFIMzyuLRSMJ+tRKeYKeQ+mR3DcAZ5I4h5CPWN9AHyUzJbWSYp/u2u0xhmgOe0+E41+GjEueA==
 
+"@svgr/babel-plugin-replace-jsx-attribute-value@8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-replace-jsx-attribute-value/-/babel-plugin-replace-jsx-attribute-value-8.0.0.tgz#8fbb6b2e91fa26ac5d4aa25c6b6e4f20f9c0ae27"
+  integrity sha512-KVQ+PtIjb1BuYT3ht8M5KbzWBhdAjjUPdlMtpuw/VjT8coTrItWX6Qafl9+ji831JaJcu6PJNKCV0bp01lBNzQ==
+
 "@svgr/babel-plugin-replace-jsx-attribute-value@^5.0.1":
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-replace-jsx-attribute-value/-/babel-plugin-replace-jsx-attribute-value-5.0.1.tgz#0b221fc57f9fcd10e91fe219e2cd0dd03145a897"
   integrity sha512-PoiE6ZD2Eiy5mK+fjHqwGOS+IXX0wq/YDtNyIgOrc6ejFnxN4b13pRpiIPbtPwHEc+NT2KCjteAcq33/F1Y9KQ==
 
+"@svgr/babel-plugin-svg-dynamic-title@8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-8.0.0.tgz#1d5ba1d281363fc0f2f29a60d6d936f9bbc657b0"
+  integrity sha512-omNiKqwjNmOQJ2v6ge4SErBbkooV2aAWwaPFs2vUY7p7GhVkzRkJ00kILXQvRhA6miHnNpXv7MRnnSjdRjK8og==
+
 "@svgr/babel-plugin-svg-dynamic-title@^5.4.0":
   version "5.4.0"
   resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-5.4.0.tgz#139b546dd0c3186b6e5db4fefc26cb0baea729d7"
   integrity sha512-zSOZH8PdZOpuG1ZVx/cLVePB2ibo3WPpqo7gFIjLV9a0QsuQAzJiwwqmuEdTaW2pegyBE17Uu15mOgOcgabQZg==
 
+"@svgr/babel-plugin-svg-em-dimensions@8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-svg-em-dimensions/-/babel-plugin-svg-em-dimensions-8.0.0.tgz#35e08df300ea8b1d41cb8f62309c241b0369e501"
+  integrity sha512-mURHYnu6Iw3UBTbhGwE/vsngtCIbHE43xCRK7kCw4t01xyGqb2Pd+WXekRRoFOBIY29ZoOhUCTEweDMdrjfi9g==
+
 "@svgr/babel-plugin-svg-em-dimensions@^5.4.0":
   version "5.4.0"
   resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-svg-em-dimensions/-/babel-plugin-svg-em-dimensions-5.4.0.tgz#6543f69526632a133ce5cabab965deeaea2234a0"
   integrity sha512-cPzDbDA5oT/sPXDCUYoVXEmm3VIoAWAPT6mSPTJNbQaBNUuEKVKyGH93oDY4e42PYHRW67N5alJx/eEol20abw==
 
+"@svgr/babel-plugin-transform-react-native-svg@8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-transform-react-native-svg/-/babel-plugin-transform-react-native-svg-8.0.0.tgz#023cd0895b98521f566060d6bb92100b9fee3775"
+  integrity sha512-UKrY3860AQICgH7g+6h2zkoxeVEPLYwX/uAjmqo4PIq2FIHppwhIqZstIyTz0ZtlwreKR41O3W3BzsBBiJV2Aw==
+
 "@svgr/babel-plugin-transform-react-native-svg@^5.4.0":
   version "5.4.0"
   resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-transform-react-native-svg/-/babel-plugin-transform-react-native-svg-5.4.0.tgz#00bf9a7a73f1cad3948cdab1f8dfb774750f8c80"
   integrity sha512-3eYP/SaopZ41GHwXma7Rmxcv9uRslRDTY1estspeB1w1ueZWd/tPlMfEOoccYpEMZU3jD4OU7YitnXcF5hLW2Q==
 
+"@svgr/babel-plugin-transform-svg-component@8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-8.0.0.tgz#013b4bfca88779711f0ed2739f3f7efcefcf4f7e"
+  integrity sha512-DFx8xa3cZXTdb/k3kfPeaixecQLgKh5NVBMwD0AQxOzcZawK4oo1Jh9LbrcACUivsCA7TLG8eeWgrDXjTMhRmw==
+
 "@svgr/babel-plugin-transform-svg-component@^5.5.0":
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-5.5.0.tgz#583a5e2a193e214da2f3afeb0b9e8d3250126b4a"
   integrity sha512-q4jSH1UUvbrsOtlo/tKcgSeiCHRSBdXoIoqX1pgcKK/aU3JD27wmMKwGtpB8qRYUYoyXvfGxUVKchLuR5pB3rQ==
 
+"@svgr/babel-preset@8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@svgr/babel-preset/-/babel-preset-8.0.0.tgz#6d78100b3b6daf11c940b82d5bd8c3164b9c6ad9"
+  integrity sha512-KLcjiZychInVrhs86OvcYPLTFu9L5XV2vj0XAaE1HwE3J3jLmIzRY8ttdeAg/iFyp8nhavJpafpDZTt+1LIpkQ==
+  dependencies:
+    "@svgr/babel-plugin-add-jsx-attribute" "8.0.0"
+    "@svgr/babel-plugin-remove-jsx-attribute" "8.0.0"
+    "@svgr/babel-plugin-remove-jsx-empty-expression" "8.0.0"
+    "@svgr/babel-plugin-replace-jsx-attribute-value" "8.0.0"
+    "@svgr/babel-plugin-svg-dynamic-title" "8.0.0"
+    "@svgr/babel-plugin-svg-em-dimensions" "8.0.0"
+    "@svgr/babel-plugin-transform-react-native-svg" "8.0.0"
+    "@svgr/babel-plugin-transform-svg-component" "8.0.0"
+
 "@svgr/babel-preset@^5.5.0":
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/@svgr/babel-preset/-/babel-preset-5.5.0.tgz#8af54f3e0a8add7b1e2b0fcd5a882c55393df327"
@@ -3666,6 +5364,17 @@
     "@svgr/babel-plugin-transform-react-native-svg" "^5.4.0"
     "@svgr/babel-plugin-transform-svg-component" "^5.5.0"
 
+"@svgr/core@8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@svgr/core/-/core-8.0.0.tgz#e96829cdb0473345d5671568282ee0736e86ef12"
+  integrity sha512-aJKtc+Pie/rFYsVH/unSkDaZGvEeylNv/s2cP+ta9/rYWxRVvoV/S4Qw65Kmrtah4CBK5PM6ISH9qUH7IJQCng==
+  dependencies:
+    "@babel/core" "^7.21.3"
+    "@svgr/babel-preset" "8.0.0"
+    camelcase "^6.2.0"
+    cosmiconfig "^8.1.3"
+    snake-case "^3.0.4"
+
 "@svgr/core@^5.5.0":
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/@svgr/core/-/core-5.5.0.tgz#82e826b8715d71083120fe8f2492ec7d7874a579"
@@ -3675,6 +5384,14 @@
     camelcase "^6.2.0"
     cosmiconfig "^7.0.0"
 
+"@svgr/hast-util-to-babel-ast@8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-8.0.0.tgz#6952fd9ce0f470e1aded293b792a2705faf4ffd4"
+  integrity sha512-EbDKwO9GpfWP4jN9sGdYwPBU0kdomaPIL2Eu4YwmgP+sJeXT+L7bMwJUBnhzfH8Q2qMBqZ4fJwpCyYsAN3mt2Q==
+  dependencies:
+    "@babel/types" "^7.21.3"
+    entities "^4.4.0"
+
 "@svgr/hast-util-to-babel-ast@^5.5.0":
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-5.5.0.tgz#5ee52a9c2533f73e63f8f22b779f93cd432a5461"
@@ -3682,6 +5399,16 @@
   dependencies:
     "@babel/types" "^7.12.6"
 
+"@svgr/plugin-jsx@8.0.1":
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/@svgr/plugin-jsx/-/plugin-jsx-8.0.1.tgz#b9495e06062cc0cac0e035751b69471ee328236b"
+  integrity sha512-bfCFb+4ZsM3UuKP2t7KmDwn6YV8qVn9HIQJmau6xeQb/iV65Rpi7NBNBWA2hcCd4GKoCqG8hpaaDk5FDR0eH+g==
+  dependencies:
+    "@babel/core" "^7.21.3"
+    "@svgr/babel-preset" "8.0.0"
+    "@svgr/hast-util-to-babel-ast" "8.0.0"
+    svg-parser "^2.0.4"
+
 "@svgr/plugin-jsx@^5.5.0":
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/@svgr/plugin-jsx/-/plugin-jsx-5.5.0.tgz#1aa8cd798a1db7173ac043466d7b52236b369000"
@@ -3692,6 +5419,15 @@
     "@svgr/hast-util-to-babel-ast" "^5.5.0"
     svg-parser "^2.0.2"
 
+"@svgr/plugin-svgo@8.0.1":
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/@svgr/plugin-svgo/-/plugin-svgo-8.0.1.tgz#df0199313fdc88c3d7cd8e0dff16695e9718548c"
+  integrity sha512-29OJ1QmJgnohQHDAgAuY2h21xWD6TZiXji+hnx+W635RiXTAlHTbjrZDktfqzkN0bOeQEtNe+xgq73/XeWFfSg==
+  dependencies:
+    cosmiconfig "^8.1.3"
+    deepmerge "^4.3.1"
+    svgo "^3.0.2"
+
 "@svgr/plugin-svgo@^5.5.0":
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/@svgr/plugin-svgo/-/plugin-svgo-5.5.0.tgz#02da55d85320549324e201c7b2e53bf431fcc246"
@@ -3715,6 +5451,27 @@
     "@svgr/plugin-svgo" "^5.5.0"
     loader-utils "^2.0.0"
 
+"@svgr/webpack@^8.0.1":
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/@svgr/webpack/-/webpack-8.0.1.tgz#a0e4a711daae347b515335449d198a275b3ab1e4"
+  integrity sha512-zSoeKcbCmfMXjA11uDuCJb+1LWNb3vy6Qw/VHj0Nfcl3UuqwuoZWknHsBIhCWvi4wU9vPui3aq054qjVyZqY4A==
+  dependencies:
+    "@babel/core" "^7.21.3"
+    "@babel/plugin-transform-react-constant-elements" "^7.21.3"
+    "@babel/preset-env" "^7.20.2"
+    "@babel/preset-react" "^7.18.6"
+    "@babel/preset-typescript" "^7.21.0"
+    "@svgr/core" "8.0.0"
+    "@svgr/plugin-jsx" "8.0.1"
+    "@svgr/plugin-svgo" "8.0.1"
+
+"@swc/helpers@~0.5.0":
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/@swc/helpers/-/helpers-0.5.1.tgz#e9031491aa3f26bfcc974a67f48bd456c8a5357a"
+  integrity sha512-sJ902EfIzn1Fa+qYmjdQqh8tPsoxyBz+8yBKC2HKUxyezKJFwPGOn7pv4WY6QuQW//ySQi5lJjA/ZT9sNWWNTg==
+  dependencies:
+    tslib "^2.4.0"
+
 "@szmarczak/http-timer@^1.1.2":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421"
@@ -3736,18 +5493,18 @@
   dependencies:
     defer-to-connect "^2.0.1"
 
-"@testing-library/dom@^8.5.0":
-  version "8.19.1"
-  resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-8.19.1.tgz#0e2dafd281dedb930bb235eac1045470b4129d0e"
-  integrity sha512-P6iIPyYQ+qH8CvGauAqanhVnjrnRe0IZFSYCeGkSRW9q3u8bdVn2NPI+lasFyVsEQn1J/IFmp5Aax41+dAP9wg==
+"@testing-library/dom@^9.0.0":
+  version "9.3.1"
+  resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-9.3.1.tgz#8094f560e9389fb973fe957af41bf766937a9ee9"
+  integrity sha512-0DGPd9AR3+iDTjGoMpxIkAsUihHZ3Ai6CneU6bRRrffXMgzCdlNk43jTrD2/5LT6CBb3MWTP8v510JzYtahD2w==
   dependencies:
     "@babel/code-frame" "^7.10.4"
     "@babel/runtime" "^7.12.5"
     "@types/aria-query" "^5.0.1"
-    aria-query "^5.0.0"
+    aria-query "5.1.3"
     chalk "^4.1.0"
     dom-accessibility-api "^0.5.9"
-    lz-string "^1.4.4"
+    lz-string "^1.5.0"
     pretty-format "^27.0.2"
 
 "@testing-library/jest-dom@^5.16.5":
@@ -3773,13 +5530,13 @@
     "@babel/runtime" "^7.12.5"
     react-error-boundary "^3.1.0"
 
-"@testing-library/react@^13.4.0":
-  version "13.4.0"
-  resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-13.4.0.tgz#6a31e3bf5951615593ad984e96b9e5e2d9380966"
-  integrity sha512-sXOGON+WNTh3MLE9rve97ftaZukN3oNf2KjDy7YTx6hcTO2uuLHuCGynMDhFwGw/jYf4OJ2Qk0i4i79qMNNkyw==
+"@testing-library/react@14.0.0":
+  version "14.0.0"
+  resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-14.0.0.tgz#59030392a6792450b9ab8e67aea5f3cc18d6347c"
+  integrity sha512-S04gSNJbYE30TlIMLTzv6QCTzt9AqIF5y6s6SzVFILNcNvbV/jU96GeiTPillGQo+Ny64M/5PV7klNYYgv5Dfg==
   dependencies:
     "@babel/runtime" "^7.12.5"
-    "@testing-library/dom" "^8.5.0"
+    "@testing-library/dom" "^9.0.0"
     "@types/react-dom" "^18.0.0"
 
 "@testing-library/user-event@^13.5.0":
@@ -3794,11 +5551,26 @@
   resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82"
   integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==
 
+"@tootallnate/once@2":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf"
+  integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==
+
 "@trysound/sax@0.2.0":
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/@trysound/sax/-/sax-0.2.0.tgz#cccaab758af56761eb7bf37af6f03f326dd798ad"
   integrity sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==
 
+"@ts-morph/common@~0.18.0":
+  version "0.18.1"
+  resolved "https://registry.yarnpkg.com/@ts-morph/common/-/common-0.18.1.tgz#ca40c3a62c3f9e17142e0af42633ad63efbae0ec"
+  integrity sha512-RVE+zSRICWRsfrkAw5qCAK+4ZH9kwEFv5h0+/YeHTLieWP7F4wWq4JsKFuNWG+fYh/KF+8rAtgdj5zb2mm+DVA==
+  dependencies:
+    fast-glob "^3.2.12"
+    minimatch "^5.1.0"
+    mkdirp "^1.0.4"
+    path-browserify "^1.0.1"
+
 "@tsconfig/node10@^1.0.7":
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.9.tgz#df4907fc07a886922637b15e02d4cebc4c0021b2"
@@ -3827,6 +5599,11 @@
     lodash "^4.17.15"
     ts-essentials "^7.0.1"
 
+"@types/argparse@1.0.38":
+  version "1.0.38"
+  resolved "https://registry.yarnpkg.com/@types/argparse/-/argparse-1.0.38.tgz#a81fd8606d481f873a3800c6ebae4f1d768a56a9"
+  integrity sha512-ebDJ9b0e702Yr7pWgB0jzm+CX4Srzz8RcXtLJDJB+BSccqMa36uyH/zUsSYao5+BD1ytv3k3rPYCq4mAE1hsXA==
+
 "@types/aria-query@^5.0.1":
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/@types/aria-query/-/aria-query-5.0.1.tgz#3286741fb8f1e1580ac28784add4c7a1d49bdfbc"
@@ -3924,6 +5701,18 @@
     "@types/node" "*"
     "@types/responselike" "^1.0.0"
 
+"@types/chai-subset@^1.3.3":
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/@types/chai-subset/-/chai-subset-1.3.3.tgz#97893814e92abd2c534de422cb377e0e0bdaac94"
+  integrity sha512-frBecisrNGz+F4T6bcc+NLeolfiojh5FxW2klu669+8BARtyQv2C/GkNW6FUodVe4BroGMP/wER/YDGc7rEllw==
+  dependencies:
+    "@types/chai" "*"
+
+"@types/chai@*", "@types/chai@^4.3.5":
+  version "4.3.5"
+  resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.3.5.tgz#ae69bcbb1bebb68c4ac0b11e9d8ed04526b3562b"
+  integrity sha512-mEo1sAde+UCE6b2hxn332f1g1E8WfYRu6p5SvTKr2ZKC1f7gFJXk4h5PyGP9Dt6gCaG8y8XhwnXWC6Iy2cmBng==
+
 "@types/clone-deep@^4.0.1":
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/@types/clone-deep/-/clone-deep-4.0.1.tgz#7c488443ab9f571cd343d774551b78e9264ea990"
@@ -4170,6 +5959,14 @@
     "@types/estree" "*"
     "@types/json-schema" "*"
 
+"@types/eslint@^8.4.5":
+  version "8.40.2"
+  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.40.2.tgz#2833bc112d809677864a4b0e7d1de4f04d7dac2d"
+  integrity sha512-PRVjQ4Eh9z9pmmtaq8nTjZjQwKFk7YIHIud3lRoKRBgUQjgjRmoGxxGEPXQkF+lH7QkHJRNr5F4aBgYCW0lqpQ==
+  dependencies:
+    "@types/estree" "*"
+    "@types/json-schema" "*"
+
 "@types/estree@*":
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.0.tgz#5fb2e536c1ae9bf35366eed879e827fa59ca41c2"
@@ -4185,6 +5982,11 @@
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.51.tgz#cfd70924a25a3fd32b218e5e420e6897e1ac4f40"
   integrity sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==
 
+"@types/estree@^1.0.0":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.1.tgz#aa22750962f3bf0e79d753d3cc067f010c95f194"
+  integrity sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA==
+
 "@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.31":
   version "4.17.32"
   resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.32.tgz#93dda387f5516af616d8d3f05f2c4c79d81e1b82"
@@ -4209,7 +6011,7 @@
   resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.10.tgz#6dfbf5ea17142f7f9a043809f1cd4c448cb68249"
   integrity sha512-Nmh0K3iWQJzniTuPRcJn5hxXkfB1T1pgB89SBig5PlJQU5yocazeu4jATJlaA0GYFKWMqDdvYemoSnF2pXgLVA==
 
-"@types/graceful-fs@^4.1.2":
+"@types/graceful-fs@^4.1.2", "@types/graceful-fs@^4.1.3":
   version "4.1.6"
   resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.6.tgz#e14b2576a1c25026b7f02ede1de3b84c3a1efeae"
   integrity sha512-Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw==
@@ -4273,13 +6075,22 @@
     expect "^29.0.0"
     pretty-format "^29.0.0"
 
-"@types/jest@^27.5.2":
-  version "27.5.2"
-  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-27.5.2.tgz#ec49d29d926500ffb9fd22b84262e862049c026c"
-  integrity sha512-mpT8LJJ4CMeeahobofYWIjFo0xonRS/HfxnVEPMPFSQdGUt1uHCnoPT7Zhb+sjDU2wz0oKV0OLUR0WzrHNgfeA==
+"@types/jest@^29.4.0":
+  version "29.5.2"
+  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-29.5.2.tgz#86b4afc86e3a8f3005b297ed8a72494f89e6395b"
+  integrity sha512-mSoZVJF5YzGVCk+FsDxzDuH7s+SCkzrgKZzf0Z0T2WudhBUPoF6ktoTPC4R0ZoCPCV5xUvuU6ias5NvxcBcMMg==
+  dependencies:
+    expect "^29.0.0"
+    pretty-format "^29.0.0"
+
+"@types/jsdom@^20.0.0":
+  version "20.0.1"
+  resolved "https://registry.yarnpkg.com/@types/jsdom/-/jsdom-20.0.1.tgz#07c14bc19bd2f918c1929541cdaacae894744808"
+  integrity sha512-d0r18sZPmMQr1eG35u12FZfhIXNrnsPU/g5wvRKCUf/tOGilKKwYMYGqh33BNR6ba+2gkHw1EUiHoN3mn7E5IQ==
   dependencies:
-    jest-matcher-utils "^27.0.0"
-    pretty-format "^27.0.0"
+    "@types/node" "*"
+    "@types/tough-cookie" "*"
+    parse5 "^7.0.0"
 
 "@types/json-schema@*", "@types/json-schema@^7.0.4", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
   version "7.0.11"
@@ -4298,6 +6109,11 @@
   dependencies:
     "@types/node" "*"
 
+"@types/lodash@^4.14.175":
+  version "4.14.195"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.195.tgz#bafc975b252eb6cea78882ce8a7b6bf22a6de632"
+  integrity sha512-Hwx9EUgdwf2GLarOjQp5ZH8ZmblzcbTBC2wtQWNKARBSxM9ezRIAUpeDTgoQRAFB0+8CNWXVA9+MaSOzOF3nPg==
+
 "@types/long@^4.0.1":
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.2.tgz#b74129719fc8d11c01868010082d483b7545591a"
@@ -4345,6 +6161,11 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-16.9.1.tgz#0611b37db4246c937feef529ddcc018cf8e35708"
   integrity sha512-QpLcX9ZSsq3YYUUnD3nFDY8H7wctAhQj/TFKL8Ya8v5fMm3CFXxo8zStsLAl780ltoYoo1WvKUVGBQK+1ifr7g==
 
+"@types/node@18.14.2":
+  version "18.14.2"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.14.2.tgz#c076ed1d7b6095078ad3cf21dfeea951842778b1"
+  integrity sha512-1uEQxww3DaghA0RxqHx0O0ppVlo43pJhepY51OxuQIKHpjbnYLA7vcdwioNPzIqmC2u3I/dmylcqjlh0e7AyUA==
+
 "@types/node@^10.12.18":
   version "10.17.60"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.60.tgz#35f3d6213daed95da7f0f73e75bcc6980e90597b"
@@ -4360,11 +6181,6 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.36.tgz#c414052cb9d43fab67d679d5f3c641be911f5835"
   integrity sha512-FXKWbsJ6a1hIrRxv+FoukuHnGTgEzKYGi7kilfMae96AL9UNkPFNWJEEYWzdRI9ooIkbr4AKldyuSTLql06vLQ==
 
-"@types/node@^16.18.11":
-  version "16.18.11"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.11.tgz#cbb15c12ca7c16c85a72b6bdc4d4b01151bb3cae"
-  integrity sha512-3oJbGBUWuS6ahSnEq1eN2XrCyf4YsWI8OyCvo7c64zQJNplk3mO84t53o8lfTk+2ji59g5ycfc6qQ3fdHliHuA==
-
 "@types/normalize-package-data@^2.4.0":
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301"
@@ -4414,7 +6230,14 @@
   dependencies:
     "@types/react" "*"
 
-"@types/react-dom@^18.0.0", "@types/react-dom@^18.0.10":
+"@types/react-dom@18.0.11":
+  version "18.0.11"
+  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.0.11.tgz#321351c1459bc9ca3d216aefc8a167beec334e33"
+  integrity sha512-O38bPbI2CWtgw/OoQoY+BRelw7uysmXbWvw3nLWO21H1HSh+GOlqPuXshJfjmpNlKiiSDG9cc1JZAaMmVdcTlw==
+  dependencies:
+    "@types/react" "*"
+
+"@types/react-dom@^18.0.0":
   version "18.0.10"
   resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.0.10.tgz#3b66dec56aa0f16a6cc26da9e9ca96c35c0b4352"
   integrity sha512-E42GW/JA4Qv15wQdqJq8DL4JhNpB3prJgjgapN3qJT9K2zO5IIAQh4VXvCEDupoqAwnz0cY4RlXeC/ajX5SFHg==
@@ -4468,7 +6291,7 @@
   dependencies:
     "@types/react" "*"
 
-"@types/react@*", "@types/react@^18.0.26":
+"@types/react@*":
   version "18.0.26"
   resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.26.tgz#8ad59fc01fef8eaf5c74f4ea392621749f0b7917"
   integrity sha512-hCR3PJQsAIXyxhTNSiDFY//LhnMZWpNNr5etoCqx/iUfGc5gXWtQR2Phl908jVR6uPXacojQWTg4qRpkxTuGug==
@@ -4477,6 +6300,15 @@
     "@types/scheduler" "*"
     csstype "^3.0.2"
 
+"@types/react@18.0.28":
+  version "18.0.28"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.28.tgz#accaeb8b86f4908057ad629a26635fe641480065"
+  integrity sha512-RD0ivG1kEztNBdoAK7lekI9M+azSnitIn85h4iOiaLjaTrMjzslhaqCGaI4IyCJ1RljWiLCEu4jyrLLgqxBTew==
+  dependencies:
+    "@types/prop-types" "*"
+    "@types/scheduler" "*"
+    csstype "^3.0.2"
+
 "@types/rebass@^4.0.10":
   version "4.0.10"
   resolved "https://registry.yarnpkg.com/@types/rebass/-/rebass-4.0.10.tgz#f7a819d039349c138f279d2104986d7604a85528"
@@ -4590,6 +6422,11 @@
   dependencies:
     "@types/jest" "*"
 
+"@types/tough-cookie@*":
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-4.0.2.tgz#6286b4c7228d58ab7866d19716f3696e03a09397"
+  integrity sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw==
+
 "@types/trusted-types@^2.0.2":
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/@types/trusted-types/-/trusted-types-2.0.2.tgz#fc25ad9943bcac11cceb8168db4f275e0e72e756"
@@ -4702,6 +6539,14 @@
     "@typescript-eslint/types" "5.48.1"
     "@typescript-eslint/visitor-keys" "5.48.1"
 
+"@typescript-eslint/scope-manager@5.60.0":
+  version "5.60.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.60.0.tgz#ae511967b4bd84f1d5e179bb2c82857334941c1c"
+  integrity sha512-hakuzcxPwXi2ihf9WQu1BbRj1e/Pd8ZZwVTG9kfbxAMZstKz8/9OoexIwnmLzShtsdap5U/CoQGRCWlSuPbYxQ==
+  dependencies:
+    "@typescript-eslint/types" "5.60.0"
+    "@typescript-eslint/visitor-keys" "5.60.0"
+
 "@typescript-eslint/type-utils@5.48.1":
   version "5.48.1"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.48.1.tgz#5d94ac0c269a81a91ad77c03407cea2caf481412"
@@ -4712,11 +6557,26 @@
     debug "^4.3.4"
     tsutils "^3.21.0"
 
+"@typescript-eslint/type-utils@^5.58.0":
+  version "5.60.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.60.0.tgz#69b09087eb12d7513d5b07747e7d47f5533aa228"
+  integrity sha512-X7NsRQddORMYRFH7FWo6sA9Y/zbJ8s1x1RIAtnlj6YprbToTiQnM6vxcMu7iYhdunmoC0rUWlca13D5DVHkK2g==
+  dependencies:
+    "@typescript-eslint/typescript-estree" "5.60.0"
+    "@typescript-eslint/utils" "5.60.0"
+    debug "^4.3.4"
+    tsutils "^3.21.0"
+
 "@typescript-eslint/types@5.48.1":
   version "5.48.1"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.48.1.tgz#efd1913a9aaf67caf8a6e6779fd53e14e8587e14"
   integrity sha512-xHyDLU6MSuEEdIlzrrAerCGS3T7AA/L8Hggd0RCYBi0w3JMvGYxlLlXHeg50JI9Tfg5MrtsfuNxbS/3zF1/ATg==
 
+"@typescript-eslint/types@5.60.0":
+  version "5.60.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.60.0.tgz#3179962b28b4790de70e2344465ec97582ce2558"
+  integrity sha512-ascOuoCpNZBccFVNJRSC6rPq4EmJ2NkuoKnd6LDNyAQmdDnziAtxbCGWCbefG1CNzmDvd05zO36AmB7H8RzKPA==
+
 "@typescript-eslint/typescript-estree@5.48.1":
   version "5.48.1"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.48.1.tgz#9efa8ee2aa471c6ab62e649f6e64d8d121bc2056"
@@ -4730,6 +6590,19 @@
     semver "^7.3.7"
     tsutils "^3.21.0"
 
+"@typescript-eslint/typescript-estree@5.60.0":
+  version "5.60.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.60.0.tgz#4ddf1a81d32a850de66642d9b3ad1e3254fb1600"
+  integrity sha512-R43thAuwarC99SnvrBmh26tc7F6sPa2B3evkXp/8q954kYL6Ro56AwASYWtEEi+4j09GbiNAHqYwNNZuNlARGQ==
+  dependencies:
+    "@typescript-eslint/types" "5.60.0"
+    "@typescript-eslint/visitor-keys" "5.60.0"
+    debug "^4.3.4"
+    globby "^11.1.0"
+    is-glob "^4.0.3"
+    semver "^7.3.7"
+    tsutils "^3.21.0"
+
 "@typescript-eslint/utils@5.48.1", "@typescript-eslint/utils@^5.13.0":
   version "5.48.1"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.48.1.tgz#20f2f4e88e9e2a0961cbebcb47a1f0f7da7ba7f9"
@@ -4744,6 +6617,20 @@
     eslint-utils "^3.0.0"
     semver "^7.3.7"
 
+"@typescript-eslint/utils@5.60.0", "@typescript-eslint/utils@^5.58.0":
+  version "5.60.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.60.0.tgz#4667c5aece82f9d4f24a667602f0f300864b554c"
+  integrity sha512-ba51uMqDtfLQ5+xHtwlO84vkdjrqNzOnqrnwbMHMRY8Tqeme8C2Q8Fc7LajfGR+e3/4LoYiWXUM6BpIIbHJ4hQ==
+  dependencies:
+    "@eslint-community/eslint-utils" "^4.2.0"
+    "@types/json-schema" "^7.0.9"
+    "@types/semver" "^7.3.12"
+    "@typescript-eslint/scope-manager" "5.60.0"
+    "@typescript-eslint/types" "5.60.0"
+    "@typescript-eslint/typescript-estree" "5.60.0"
+    eslint-scope "^5.1.1"
+    semver "^7.3.7"
+
 "@typescript-eslint/visitor-keys@5.48.1":
   version "5.48.1"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.48.1.tgz#79fd4fb9996023ef86849bf6f904f33eb6c8fccb"
@@ -4752,6 +6639,14 @@
     "@typescript-eslint/types" "5.48.1"
     eslint-visitor-keys "^3.3.0"
 
+"@typescript-eslint/visitor-keys@5.60.0":
+  version "5.60.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.60.0.tgz#b48b29da3f5f31dd1656281727004589d2722a66"
+  integrity sha512-wm9Uz71SbCyhUKgcaPRauBdTegUyY/ZWl8gLwD/i/ybJqscrrdVSFImpvUz16BLPChIeKBK5Fa9s6KDQjsjyWw==
+  dependencies:
+    "@typescript-eslint/types" "5.60.0"
+    eslint-visitor-keys "^3.3.0"
+
 "@uniswap/default-token-list@^2.0.0":
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/@uniswap/default-token-list/-/default-token-list-2.3.0.tgz#e5e522e775791999643aac9b0faf1ccfb4c49bd8"
@@ -4968,6 +6863,167 @@
   dependencies:
     "@use-gesture/core" "10.2.23"
 
+"@verdaccio/commons-api@10.2.0":
+  version "10.2.0"
+  resolved "https://registry.yarnpkg.com/@verdaccio/commons-api/-/commons-api-10.2.0.tgz#3b684c31749837b0574375bb2e10644ecea9fcca"
+  integrity sha512-F/YZANu4DmpcEV0jronzI7v2fGVWkQ5Mwi+bVmV+ACJ+EzR0c9Jbhtbe5QyLUuzR97t8R5E/Xe53O0cc2LukdQ==
+  dependencies:
+    http-errors "2.0.0"
+    http-status-codes "2.2.0"
+
+"@verdaccio/config@6.0.0-6-next.71":
+  version "6.0.0-6-next.71"
+  resolved "https://registry.yarnpkg.com/@verdaccio/config/-/config-6.0.0-6-next.71.tgz#ab28f3ec3f7430af2816bca3c574dcc5380b1a42"
+  integrity sha512-PvXXVNw28I9JWw7TYCbjA5jkkwbliZTB+TNXzWaFVOpW6s+94WWQzBNUUvPG67iPW4Wgo1ciHVdde/zOeFNfYw==
+  dependencies:
+    "@verdaccio/core" "6.0.0-6-next.71"
+    "@verdaccio/utils" "6.0.0-6-next.39"
+    debug "4.3.4"
+    js-yaml "4.1.0"
+    lodash "4.17.21"
+    minimatch "3.1.2"
+    yup "0.32.11"
+
+"@verdaccio/core@6.0.0-6-next.71":
+  version "6.0.0-6-next.71"
+  resolved "https://registry.yarnpkg.com/@verdaccio/core/-/core-6.0.0-6-next.71.tgz#a421cd460e45aac07c228ef5ec206fce0c0222be"
+  integrity sha512-leREshFssUKy+yI+Y6r9uyfuOEluLbdEs47WpI0hlV6htXkgBjfWIi884i4V/SCm+UIU8Dhn2iHPRo06KlRvFQ==
+  dependencies:
+    ajv "8.12.0"
+    core-js "3.30.2"
+    http-errors "2.0.0"
+    http-status-codes "2.2.0"
+    process-warning "1.0.0"
+    semver "7.5.0"
+
+"@verdaccio/file-locking@10.3.1":
+  version "10.3.1"
+  resolved "https://registry.yarnpkg.com/@verdaccio/file-locking/-/file-locking-10.3.1.tgz#cfc2436e0715954e0965f97dfcd87381d116f749"
+  integrity sha512-oqYLfv3Yg3mAgw9qhASBpjD50osj2AX4IwbkUtyuhhKGyoFU9eZdrbeW6tpnqUnj6yBMtAPm2eGD4BwQuX400g==
+  dependencies:
+    lockfile "1.0.4"
+
+"@verdaccio/file-locking@11.0.0-6-next.7":
+  version "11.0.0-6-next.7"
+  resolved "https://registry.yarnpkg.com/@verdaccio/file-locking/-/file-locking-11.0.0-6-next.7.tgz#ef5891992747fb07dc0a499708f4fa9960b3c5f0"
+  integrity sha512-S0GNoe2oBOgB7fKJN2vZqnl5qDEvdnTfKAfa47InXweJROeul6kjlE2/NlbNbK3zZID01VR1HFrFehMQO0Jyfw==
+  dependencies:
+    lockfile "1.0.4"
+
+"@verdaccio/local-storage@10.3.3":
+  version "10.3.3"
+  resolved "https://registry.yarnpkg.com/@verdaccio/local-storage/-/local-storage-10.3.3.tgz#fc31eea9e3da2f27e0cfaf5fe713834ed1fab9e9"
+  integrity sha512-/n0FH+1hxVg80YhYBfJuW7F2AuvLY2fra8/DTCilWDll9Y5yZDxwntZfcKHJLerCA4atrbJtvaqpWkoV3Q9x8w==
+  dependencies:
+    "@verdaccio/commons-api" "10.2.0"
+    "@verdaccio/file-locking" "10.3.1"
+    "@verdaccio/streams" "10.2.1"
+    async "3.2.4"
+    debug "4.3.4"
+    lodash "4.17.21"
+    lowdb "1.0.0"
+    mkdirp "1.0.4"
+
+"@verdaccio/logger-7@6.0.0-6-next.16":
+  version "6.0.0-6-next.16"
+  resolved "https://registry.yarnpkg.com/@verdaccio/logger-7/-/logger-7-6.0.0-6-next.16.tgz#c68160537f6fa340a1d16d62cf7bc25d62ce083a"
+  integrity sha512-QElvJcICP3DiJgDPUP4JRjWuImh6RbLWeK83iubrb/y865OmvrOgCgnBAZn0/i/L6buPFa/Sh5A07PBRuYWHgw==
+  dependencies:
+    "@verdaccio/logger-commons" "6.0.0-6-next.39"
+    pino "7.11.0"
+
+"@verdaccio/logger-commons@6.0.0-6-next.39":
+  version "6.0.0-6-next.39"
+  resolved "https://registry.yarnpkg.com/@verdaccio/logger-commons/-/logger-commons-6.0.0-6-next.39.tgz#8d51beae011e5ead1c28700eadea037114724e54"
+  integrity sha512-jdk8nDu2u3307XV2RtBo+FrC30xXGuSvZN7pQqFWCB9dJo21LpsMPTCgj9eBEwaAT+/ICTJURjO0VBkMlvcbGQ==
+  dependencies:
+    "@verdaccio/core" "6.0.0-6-next.71"
+    "@verdaccio/logger-prettify" "6.0.0-6-next.10"
+    colorette "2.0.20"
+    debug "4.3.4"
+
+"@verdaccio/logger-prettify@6.0.0-6-next.10":
+  version "6.0.0-6-next.10"
+  resolved "https://registry.yarnpkg.com/@verdaccio/logger-prettify/-/logger-prettify-6.0.0-6-next.10.tgz#013c1cfb8e2b463c9a36c85c0303fd9e6d04fd35"
+  integrity sha512-G9woGojHXoRg3W4fE2ZlNy2c25f5faqLWHxVdnDFbgbH6dieG+GzlyNwiOcrRC4LEkh7dWcgwuNMx1NZFojqhg==
+  dependencies:
+    colorette "2.0.20"
+    dayjs "1.11.7"
+    lodash "4.17.21"
+    pino-abstract-transport "1.0.0"
+    sonic-boom "3.3.0"
+
+"@verdaccio/middleware@6.0.0-6-next.50":
+  version "6.0.0-6-next.50"
+  resolved "https://registry.yarnpkg.com/@verdaccio/middleware/-/middleware-6.0.0-6-next.50.tgz#f8552fc3fb5bd2ab1155ea1b762b9c8d8d57ef31"
+  integrity sha512-eWn1C3p4Tc2ijqrzM0YjSb48DyNkH30UURjh23WyUVrMC7sn7s0DR9DlrRlVC8OSi8oqyQzV1KihowkzFLDcag==
+  dependencies:
+    "@verdaccio/config" "6.0.0-6-next.71"
+    "@verdaccio/core" "6.0.0-6-next.71"
+    "@verdaccio/url" "11.0.0-6-next.37"
+    "@verdaccio/utils" "6.0.0-6-next.39"
+    debug "4.3.4"
+    express "4.18.2"
+    express-rate-limit "5.5.1"
+    lodash "4.17.21"
+    lru-cache "7.18.3"
+    mime "2.6.0"
+
+"@verdaccio/search@6.0.0-6-next.2":
+  version "6.0.0-6-next.2"
+  resolved "https://registry.yarnpkg.com/@verdaccio/search/-/search-6.0.0-6-next.2.tgz#af11a66207368648ab678aad504720c4b007cac1"
+  integrity sha512-5Hkcxoj7crPn6Zth59I54af6KO5Ho7bzvCHCDbEwcmjewKcQJB4Kst4cEtpN/xA1ao0hqOSruEObl7/mqCq8hg==
+
+"@verdaccio/signature@6.0.0-6-next.2":
+  version "6.0.0-6-next.2"
+  resolved "https://registry.yarnpkg.com/@verdaccio/signature/-/signature-6.0.0-6-next.2.tgz#2df445354e0857daa6dd7a6b744a36d570a4602d"
+  integrity sha512-aFvMbxxHzJCpPmqSgVuQYvYN2RP11CoSEcTXikkyb1zF4Uf3cOy53zUZ1Y7iOKCRYTgWrmet9KP7+24e44GHxg==
+  dependencies:
+    debug "4.3.4"
+    jsonwebtoken "9.0.0"
+    lodash "4.17.21"
+
+"@verdaccio/streams@10.2.1":
+  version "10.2.1"
+  resolved "https://registry.yarnpkg.com/@verdaccio/streams/-/streams-10.2.1.tgz#9443d24d4f17672b8f8c8e147690557918ed2bcb"
+  integrity sha512-OojIG/f7UYKxC4dYX8x5ax8QhRx1b8OYUAMz82rUottCuzrssX/4nn5QE7Ank0DUSX3C9l/HPthc4d9uKRJqJQ==
+
+"@verdaccio/tarball@11.0.0-6-next.40":
+  version "11.0.0-6-next.40"
+  resolved "https://registry.yarnpkg.com/@verdaccio/tarball/-/tarball-11.0.0-6-next.40.tgz#ac9a3c8e67f9626b0748b0e0be65f86bdbbba973"
+  integrity sha512-1470DzyV9fdEsjqFhjOQ/5kU5EEgHXV8tyqKyZK+AQ+2g6mpj6NfU5Q82fpmoyzNlPGjREygE75KBv/niRCgRA==
+  dependencies:
+    "@verdaccio/core" "6.0.0-6-next.71"
+    "@verdaccio/url" "11.0.0-6-next.37"
+    "@verdaccio/utils" "6.0.0-6-next.39"
+    debug "4.3.4"
+    lodash "4.17.21"
+
+"@verdaccio/ui-theme@6.0.0-6-next.71":
+  version "6.0.0-6-next.71"
+  resolved "https://registry.yarnpkg.com/@verdaccio/ui-theme/-/ui-theme-6.0.0-6-next.71.tgz#45e27e6060ebb0158cf02366c802af777d03ca85"
+  integrity sha512-HX9NY0pZSg/H1C4GHLGzt91Xo5Oq8+VyZYN3JocHKev/EIE6G2/UuInKGAJxxdSIkno6jUyfrGZi2t9Qhgwwnw==
+
+"@verdaccio/url@11.0.0-6-next.37":
+  version "11.0.0-6-next.37"
+  resolved "https://registry.yarnpkg.com/@verdaccio/url/-/url-11.0.0-6-next.37.tgz#a4e28a9c119c304e94b1e667e67f250a3c86ce76"
+  integrity sha512-bPEq/aS77IzMUv7H1Zq4fVJeM7IxIImCan+ydQzFWGJfoGXgAz8p5PBm1+fqCgtEyQ/TeK6EowdXitX9lAIGVQ==
+  dependencies:
+    "@verdaccio/core" "6.0.0-6-next.71"
+    debug "4.3.4"
+    lodash "4.17.21"
+    validator "13.9.0"
+
+"@verdaccio/utils@6.0.0-6-next.39":
+  version "6.0.0-6-next.39"
+  resolved "https://registry.yarnpkg.com/@verdaccio/utils/-/utils-6.0.0-6-next.39.tgz#b7a2adf5a57c76b3d1aaf5d7cb6652546abd9f4c"
+  integrity sha512-V4+pBaXxObgofHcAw7BZXv2RZwCi2KaWNIcpQNYz6AcF15gLT0C2/8e1M8nMLb7Qnips3fetpA26VNNvl5XRdw==
+  dependencies:
+    "@verdaccio/core" "6.0.0-6-next.71"
+    lodash "4.17.21"
+    minimatch "3.1.2"
+    semver "7.5.0"
+
 "@vibrant/color@^3.2.1-alpha.1":
   version "3.2.1-alpha.1"
   resolved "https://registry.yarnpkg.com/@vibrant/color/-/color-3.2.1-alpha.1.tgz#1bcee4545d2276d36f9a1acb42ab3485a9b489ec"
@@ -5056,6 +7112,74 @@
   dependencies:
     "@vibrant/types" "^3.2.1-alpha.1"
 
+"@vitejs/plugin-react@^3.0.0":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@vitejs/plugin-react/-/plugin-react-3.1.0.tgz#d1091f535eab8b83d6e74034d01e27d73c773240"
+  integrity sha512-AfgcRL8ZBhAlc3BFdigClmTUMISmmzHn7sB2h9U1odvc5U/MjWXsAaz18b/WoppUTDBzxOJwo2VdClfUcItu9g==
+  dependencies:
+    "@babel/core" "^7.20.12"
+    "@babel/plugin-transform-react-jsx-self" "^7.18.6"
+    "@babel/plugin-transform-react-jsx-source" "^7.19.6"
+    magic-string "^0.27.0"
+    react-refresh "^0.14.0"
+
+"@vitest/expect@0.31.4":
+  version "0.31.4"
+  resolved "https://registry.yarnpkg.com/@vitest/expect/-/expect-0.31.4.tgz#115c517404488bf3cb6ce4ac411c40d8e86891b8"
+  integrity sha512-tibyx8o7GUyGHZGyPgzwiaPaLDQ9MMuCOrc03BYT0nryUuhLbL7NV2r/q98iv5STlwMgaKuFJkgBW/8iPKwlSg==
+  dependencies:
+    "@vitest/spy" "0.31.4"
+    "@vitest/utils" "0.31.4"
+    chai "^4.3.7"
+
+"@vitest/runner@0.31.4":
+  version "0.31.4"
+  resolved "https://registry.yarnpkg.com/@vitest/runner/-/runner-0.31.4.tgz#e99abee89132a500d9726a53b58dfc9160db1078"
+  integrity sha512-Wgm6UER+gwq6zkyrm5/wbpXGF+g+UBB78asJlFkIOwyse0pz8lZoiC6SW5i4gPnls/zUcPLWS7Zog0LVepXnpg==
+  dependencies:
+    "@vitest/utils" "0.31.4"
+    concordance "^5.0.4"
+    p-limit "^4.0.0"
+    pathe "^1.1.0"
+
+"@vitest/snapshot@0.31.4":
+  version "0.31.4"
+  resolved "https://registry.yarnpkg.com/@vitest/snapshot/-/snapshot-0.31.4.tgz#59a42046fec4950a1ac70cf0ec64aada3b995559"
+  integrity sha512-LemvNumL3NdWSmfVAMpXILGyaXPkZbG5tyl6+RQSdcHnTj6hvA49UAI8jzez9oQyE/FWLKRSNqTGzsHuk89LRA==
+  dependencies:
+    magic-string "^0.30.0"
+    pathe "^1.1.0"
+    pretty-format "^27.5.1"
+
+"@vitest/spy@0.31.4":
+  version "0.31.4"
+  resolved "https://registry.yarnpkg.com/@vitest/spy/-/spy-0.31.4.tgz#fce8e348cea32deff79996d116c67893b19cc47d"
+  integrity sha512-3ei5ZH1s3aqbEyftPAzSuunGICRuhE+IXOmpURFdkm5ybUADk+viyQfejNk6q8M5QGX8/EVKw+QWMEP3DTJDag==
+  dependencies:
+    tinyspy "^2.1.0"
+
+"@vitest/ui@^0.31.0":
+  version "0.31.4"
+  resolved "https://registry.yarnpkg.com/@vitest/ui/-/ui-0.31.4.tgz#465a4762d7937e3322fe66f94c2378bacfeba1ac"
+  integrity sha512-sKM16ITX6HrNFF+lNZ2AQAen4/6Bx2i6KlBfIvkUjcTgc5YII/j2ltcX14oCUv4EA0OTWGQuGhO3zDoAsTENGA==
+  dependencies:
+    "@vitest/utils" "0.31.4"
+    fast-glob "^3.2.12"
+    fflate "^0.7.4"
+    flatted "^3.2.7"
+    pathe "^1.1.0"
+    picocolors "^1.0.0"
+    sirv "^2.0.3"
+
+"@vitest/utils@0.31.4":
+  version "0.31.4"
+  resolved "https://registry.yarnpkg.com/@vitest/utils/-/utils-0.31.4.tgz#5cfdcecfd604a7dbe3972cfe0f2b1e0af1246ad2"
+  integrity sha512-DobZbHacWznoGUfYU8XDPY78UubJxXfMNY1+SUdOp1NsI34eopSA6aZMeaGu10waSOeYwE8lxrd/pLfT0RMxjQ==
+  dependencies:
+    concordance "^5.0.4"
+    loupe "^2.3.6"
+    pretty-format "^27.5.1"
+
 "@walletconnect/browser-utils@^1.8.0":
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/@walletconnect/browser-utils/-/browser-utils-1.8.0.tgz#33c10e777aa6be86c713095b5206d63d32df0951"
@@ -5707,6 +7831,11 @@
     js-yaml "^3.10.0"
     tslib "^2.4.0"
 
+"@zeit/schemas@2.29.0":
+  version "2.29.0"
+  resolved "https://registry.yarnpkg.com/@zeit/schemas/-/schemas-2.29.0.tgz#a59ae6ebfdf4ddc66a876872dd736baa58b6696c"
+  integrity sha512-g5QiLIfbg3pLuYUJPlisNKY+epQJTcMDsOnVNkscrDP1oi7vmJnzOANYJI/1pZcVJ6umUkBv3aFtlg1UvUHGzA==
+
 "@zkochan/js-yaml@0.0.6":
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/@zkochan/js-yaml/-/js-yaml-0.0.6.tgz#975f0b306e705e28b8068a07737fa46d3fc04826"
@@ -5714,7 +7843,7 @@
   dependencies:
     argparse "^2.0.1"
 
-JSONStream@^1.0.4, JSONStream@^1.3.5:
+JSONStream@1.3.5, JSONStream@^1.0.4, JSONStream@^1.3.5:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0"
   integrity sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==
@@ -5722,7 +7851,7 @@ JSONStream@^1.0.4, JSONStream@^1.3.5:
     jsonparse "^1.2.0"
     through ">=2.2.7 <3"
 
-abab@^2.0.3, abab@^2.0.5:
+abab@^2.0.3, abab@^2.0.5, abab@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291"
   integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==
@@ -5755,6 +7884,14 @@ acorn-globals@^6.0.0:
     acorn "^7.1.1"
     acorn-walk "^7.1.1"
 
+acorn-globals@^7.0.0:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-7.0.1.tgz#0dbf05c44fa7c94332914c02066d5beff62c40c3"
+  integrity sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q==
+  dependencies:
+    acorn "^8.1.0"
+    acorn-walk "^8.0.2"
+
 acorn-import-assertions@^1.7.6:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9"
@@ -5779,7 +7916,7 @@ acorn-walk@^7.0.0, acorn-walk@^7.1.1:
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc"
   integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==
 
-acorn-walk@^8.0.0, acorn-walk@^8.1.1:
+acorn-walk@^8.0.0, acorn-walk@^8.0.2, acorn-walk@^8.1.1, acorn-walk@^8.2.0:
   version "8.2.0"
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1"
   integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
@@ -5794,6 +7931,11 @@ acorn@^8.0.4, acorn@^8.2.4, acorn@^8.4.1, acorn@^8.5.0, acorn@^8.7.1, acorn@^8.8
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.1.tgz#0a3f9cbecc4ec3bea6f0a80b66ae8dd2da250b73"
   integrity sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==
 
+acorn@^8.1.0, acorn@^8.8.1, acorn@^8.8.2:
+  version "8.9.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.9.0.tgz#78a16e3b2bcc198c10822786fa6679e245db5b59"
+  integrity sha512-jaVNAFBHNLXspO543WnNNPZFRtavh3skAkITqD0/2aeMkKZTN+254PyhwxFYrk3vQ1xfY+2wbesJMs/JC8/PwQ==
+
 address@^1.0.1, address@^1.1.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/address/-/address-1.2.2.tgz#2b5248dac5485a6390532c6a517fda2e3faac89e"
@@ -5865,17 +8007,17 @@ ajv-keywords@^5.0.0:
   dependencies:
     fast-deep-equal "^3.1.3"
 
-ajv@^6.10.0, ajv@^6.12.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5:
-  version "6.12.6"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
-  integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
+ajv@8.11.0:
+  version "8.11.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.11.0.tgz#977e91dd96ca669f54a11e23e378e33b884a565f"
+  integrity sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==
   dependencies:
     fast-deep-equal "^3.1.1"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.4.1"
+    json-schema-traverse "^1.0.0"
+    require-from-string "^2.0.2"
     uri-js "^4.2.2"
 
-ajv@^8.0.0, ajv@^8.11.0, ajv@^8.6.0, ajv@^8.8.0:
+ajv@8.12.0, ajv@^8.0.0, ajv@^8.11.0, ajv@^8.6.0, ajv@^8.8.0:
   version "8.12.0"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.12.0.tgz#d1a0527323e22f53562c567c00991577dfbe19d1"
   integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==
@@ -5885,7 +8027,17 @@ ajv@^8.0.0, ajv@^8.11.0, ajv@^8.6.0, ajv@^8.8.0:
     require-from-string "^2.0.2"
     uri-js "^4.2.2"
 
-ansi-align@^3.0.0:
+ajv@^6.10.0, ajv@^6.12.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5, ajv@~6.12.6:
+  version "6.12.6"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
+  integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
+  dependencies:
+    fast-deep-equal "^3.1.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.2"
+
+ansi-align@^3.0.0, ansi-align@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.1.tgz#0cdf12e111ace773a86e9a1fad1225c43cb19a59"
   integrity sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w==
@@ -5963,6 +8115,11 @@ ansi-styles@^5.0.0:
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b"
   integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==
 
+ansi-styles@^6.1.0:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5"
+  integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==
+
 any-base@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/any-base/-/any-base-1.1.0.tgz#ae101a62bc08a597b4c9ab5b7089d456630549fe"
@@ -5991,6 +8148,11 @@ anymatch@^3.0.3, anymatch@~3.1.1, anymatch@~3.1.2:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
+apache-md5@1.1.8:
+  version "1.1.8"
+  resolved "https://registry.yarnpkg.com/apache-md5/-/apache-md5-1.1.8.tgz#ea79c6feb03abfed42b2830dde06f75df5e3bbd9"
+  integrity sha512-FCAJojipPn0bXjuEpjOOOMN8FZDkxfWWp4JGN9mifU2IhxvKyXZYqpzPHdnTSUpmPDy+tsslB6Z1g+Vg6nVbYA==
+
 aproba@^1.0.3:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
@@ -6009,17 +8171,17 @@ are-we-there-yet@~1.1.2:
     delegates "^1.0.0"
     readable-stream "^2.0.6"
 
+arg@5.0.2, arg@^5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/arg/-/arg-5.0.2.tgz#c81433cc427c92c4dcf4865142dbca6f15acd59c"
+  integrity sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==
+
 arg@^4.1.0:
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089"
   integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==
 
-arg@^5.0.2:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/arg/-/arg-5.0.2.tgz#c81433cc427c92c4dcf4865142dbca6f15acd59c"
-  integrity sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==
-
-argparse@^1.0.7:
+argparse@^1.0.7, argparse@~1.0.9:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
   integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
@@ -6031,7 +8193,7 @@ argparse@^2.0.1:
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
   integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
 
-aria-query@^5.0.0, aria-query@^5.1.3:
+aria-query@5.1.3, aria-query@^5.0.0, aria-query@^5.1.3:
   version "5.1.3"
   resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-5.1.3.tgz#19db27cd101152773631396f7a95a3b58c22c35e"
   integrity sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ==
@@ -6207,11 +8369,18 @@ async-retry@^1.3.1:
   dependencies:
     retry "0.13.1"
 
-async@^3.0.0, async@^3.1.0, async@^3.2.0, async@^3.2.3:
+async@3.2.4, async@^3.0.0, async@^3.1.0, async@^3.2.0, async@^3.2.3:
   version "3.2.4"
   resolved "https://registry.yarnpkg.com/async/-/async-3.2.4.tgz#2d22e00f8cddeb5fde5dd33522b56d1cf569a81c"
   integrity sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==
 
+async@^2.6.4:
+  version "2.6.4"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221"
+  integrity sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==
+  dependencies:
+    lodash "^4.17.14"
+
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
@@ -6294,6 +8463,14 @@ axios@^0.21.0, axios@^0.21.1:
   dependencies:
     follow-redirects "^1.14.0"
 
+axios@^0.27.2:
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-0.27.2.tgz#207658cc8621606e586c85db4b41a750e756d972"
+  integrity sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==
+  dependencies:
+    follow-redirects "^1.14.9"
+    form-data "^4.0.0"
+
 axios@^1.0.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/axios/-/axios-1.4.0.tgz#38a7bf1224cd308de271146038b551d725f0be1f"
@@ -6333,6 +8510,19 @@ babel-jest@^27.4.2, babel-jest@^27.5.1:
     graceful-fs "^4.2.9"
     slash "^3.0.0"
 
+babel-jest@^29.4.1, babel-jest@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-29.5.0.tgz#3fe3ddb109198e78b1c88f9ebdecd5e4fc2f50a5"
+  integrity sha512-mA4eCDh5mSo2EcA9xQjVTpmbbNk32Zb3Q3QFQsNhaK56Q+yoXowzFodLux30HRgyOho5rsQ6B0P9QpMkvvnJ0Q==
+  dependencies:
+    "@jest/transform" "^29.5.0"
+    "@types/babel__core" "^7.1.14"
+    babel-plugin-istanbul "^6.1.1"
+    babel-preset-jest "^29.5.0"
+    chalk "^4.0.0"
+    graceful-fs "^4.2.9"
+    slash "^3.0.0"
+
 babel-loader@^8.2.3:
   version "8.3.0"
   resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.3.0.tgz#124936e841ba4fe8176786d6ff28add1f134d6a8"
@@ -6350,6 +8540,15 @@ babel-messages@^6.23.0:
   dependencies:
     babel-runtime "^6.22.0"
 
+babel-plugin-const-enum@^1.0.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-const-enum/-/babel-plugin-const-enum-1.2.0.tgz#3d25524106f68f081e187829ba736b251c289861"
+  integrity sha512-o1m/6iyyFnp9MRsK1dHF3bneqyf3AlM2q3A/YbgQr2pCat6B6XJVDv2TXqzfY2RYUi4mak6WAksSBPlyYGx9dg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-syntax-typescript" "^7.3.3"
+    "@babel/traverse" "^7.16.0"
+
 babel-plugin-emotion@^10.0.27:
   version "10.2.2"
   resolved "https://registry.yarnpkg.com/babel-plugin-emotion/-/babel-plugin-emotion-10.2.2.tgz#a1fe3503cff80abfd0bdda14abd2e8e57a79d17d"
@@ -6387,7 +8586,17 @@ babel-plugin-jest-hoist@^27.5.1:
     "@types/babel__core" "^7.0.0"
     "@types/babel__traverse" "^7.0.6"
 
-babel-plugin-macros@^2.0.0:
+babel-plugin-jest-hoist@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.5.0.tgz#a97db437936f441ec196990c9738d4b88538618a"
+  integrity sha512-zSuuuAlTMT4mzLj2nPnUm6fsE6270vdOfnpbJ+RmruU75UhLFvL0N2NgI7xpeS7NaB6hGqmd5pVpGTDYvi4Q3w==
+  dependencies:
+    "@babel/template" "^7.3.3"
+    "@babel/types" "^7.3.3"
+    "@types/babel__core" "^7.1.14"
+    "@types/babel__traverse" "^7.0.6"
+
+babel-plugin-macros@^2.0.0, babel-plugin-macros@^2.8.0:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz#0f958a7cc6556b1e65344465d99111a1e5e10138"
   integrity sha512-SEP5kJpfGYqYKpBrj5XU3ahw5p5GOHJ0U5ssOSQ/WBVdwkD2Dzlce95exQTs3jOVWPPKLBN2rlEWkCK7dSmLvg==
@@ -6419,6 +8628,15 @@ babel-plugin-polyfill-corejs2@^0.3.3:
     "@babel/helper-define-polyfill-provider" "^0.3.3"
     semver "^6.1.1"
 
+babel-plugin-polyfill-corejs2@^0.4.3:
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.3.tgz#75044d90ba5043a5fb559ac98496f62f3eb668fd"
+  integrity sha512-bM3gHc337Dta490gg+/AseNB9L4YLHxq1nGKZZSHbhXv4aTYU2MD2cjza1Ru4S6975YLTaL1K8uJf6ukJhhmtw==
+  dependencies:
+    "@babel/compat-data" "^7.17.7"
+    "@babel/helper-define-polyfill-provider" "^0.4.0"
+    semver "^6.1.1"
+
 babel-plugin-polyfill-corejs3@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.6.0.tgz#56ad88237137eade485a71b52f72dbed57c6230a"
@@ -6427,6 +8645,14 @@ babel-plugin-polyfill-corejs3@^0.6.0:
     "@babel/helper-define-polyfill-provider" "^0.3.3"
     core-js-compat "^3.25.1"
 
+babel-plugin-polyfill-corejs3@^0.8.1:
+  version "0.8.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.1.tgz#39248263c38191f0d226f928d666e6db1b4b3a8a"
+  integrity sha512-ikFrZITKg1xH6pLND8zT14UPgjKHiGLqex7rGEZCH2EvhsneJaJPemmpQaIZV5AL03II+lXylw3UmddDK8RU5Q==
+  dependencies:
+    "@babel/helper-define-polyfill-provider" "^0.4.0"
+    core-js-compat "^3.30.1"
+
 babel-plugin-polyfill-regenerator@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz#390f91c38d90473592ed43351e801a9d3e0fd747"
@@ -6434,6 +8660,13 @@ babel-plugin-polyfill-regenerator@^0.4.1:
   dependencies:
     "@babel/helper-define-polyfill-provider" "^0.3.3"
 
+babel-plugin-polyfill-regenerator@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.0.tgz#e7344d88d9ef18a3c47ded99362ae4a757609380"
+  integrity sha512-hDJtKjMLVa7Z+LwnTCxoDLQj6wdc+B8dun7ayF2fYieI6OzfuvcLMB32ihJZ4UhCBwNYGl5bg/x/P9cMdnkc2g==
+  dependencies:
+    "@babel/helper-define-polyfill-provider" "^0.4.0"
+
 "babel-plugin-styled-components@>= 1.12.0":
   version "2.0.7"
   resolved "https://registry.yarnpkg.com/babel-plugin-styled-components/-/babel-plugin-styled-components-2.0.7.tgz#c81ef34b713f9da2b7d3f5550df0d1e19e798086"
@@ -6455,6 +8688,13 @@ babel-plugin-transform-react-remove-prop-types@^0.4.24:
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.24.tgz#f2edaf9b4c6a5fbe5c1d678bfb531078c1555f3a"
   integrity sha512-eqj0hVcJUR57/Ug2zE1Yswsw4LhuqqHhD+8v120T1cl3kjg76QwtyBrdIk4WVwK+lAhBJVYCd/v+4nc4y+8JsA==
 
+babel-plugin-transform-typescript-metadata@^0.3.1:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-typescript-metadata/-/babel-plugin-transform-typescript-metadata-0.3.2.tgz#7a327842d8c36ffe07ee1b5276434e56c297c9b7"
+  integrity sha512-mWEvCQTgXQf48yDqgN7CH50waTyYBeP2Lpqx4nNWab9sxEpdXVeKgfj1qYI2/TgUPQtNFZ85i3PemRtnXVYYJg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
 babel-preset-current-node-syntax@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz#b4399239b89b2a011f9ddbe3e4f401fc40cff73b"
@@ -6481,6 +8721,14 @@ babel-preset-jest@^27.5.1:
     babel-plugin-jest-hoist "^27.5.1"
     babel-preset-current-node-syntax "^1.0.0"
 
+babel-preset-jest@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-29.5.0.tgz#57bc8cc88097af7ff6a5ab59d1cd29d52a5916e2"
+  integrity sha512-JOMloxOqdiBSxMAzjRaH023/vvcaSaec49zvg+2LmNsktC7ei39LTJGw02J+9uUtTZUq6xbLyJ4dxe9sSmIuAg==
+  dependencies:
+    babel-plugin-jest-hoist "^29.5.0"
+    babel-preset-current-node-syntax "^1.0.0"
+
 babel-preset-react-app@^10.0.1:
   version "10.0.1"
   resolved "https://registry.yarnpkg.com/babel-preset-react-app/-/babel-preset-react-app-10.0.1.tgz#ed6005a20a24f2c88521809fa9aea99903751584"
@@ -6594,6 +8842,13 @@ base64id@1.0.0:
   resolved "https://registry.yarnpkg.com/base64id/-/base64id-1.0.0.tgz#47688cb99bb6804f0e06d3e763b1c32e57d8e6b6"
   integrity sha512-rz8L+d/xByiB/vLVftPkyY215fqNrmasrcJsYkVcm4TgJNz+YXKrFaFAWibSaHkiKoSgMDCb+lipOIRQNGYesw==
 
+basic-auth@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/basic-auth/-/basic-auth-2.0.1.tgz#b998279bf47ce38344b4f3cf916d4679bbf51e3a"
+  integrity sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==
+  dependencies:
+    safe-buffer "5.1.2"
+
 batch@0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"
@@ -6615,6 +8870,11 @@ bcrypt-pbkdf@^1.0.0:
   dependencies:
     tweetnacl "^0.14.3"
 
+bcryptjs@2.4.3:
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/bcryptjs/-/bcryptjs-2.4.3.tgz#9ab5627b93e60621ff7cdac5da9733027df1d0cb"
+  integrity sha512-V/Hy/X9Vt7f3BbPJEi8BdVFMByHi+jNXrYkW3huaybV/kQ0KJg0Y6PkEMbn+zeT+i+SiKZ/HMqJGIIt4LZDqNQ==
+
 bech32@1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/bech32/-/bech32-1.1.4.tgz#e38c9f37bf179b8eb16ae3a772b40c356d4832e9"
@@ -6730,11 +8990,16 @@ block-stream@*:
   dependencies:
     inherits "~2.0.0"
 
-bluebird@^3.5.0, bluebird@^3.5.5, bluebird@^3.7.2:
+bluebird@3.7.2, bluebird@^3.5.0, bluebird@^3.5.5, bluebird@^3.7.2:
   version "3.7.2"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
   integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
 
+blueimp-md5@^2.10.0:
+  version "2.19.0"
+  resolved "https://registry.yarnpkg.com/blueimp-md5/-/blueimp-md5-2.19.0.tgz#b53feea5498dcb53dc6ec4b823adb84b729c4af0"
+  integrity sha512-DRQrD6gJyy8FbiE4s+bDoXS9hiW3Vbx5uCdwvcCf3zLHL+Iv7LtGHLpr+GZV8rHG8tK766FGYBwRbu8pELTt+w==
+
 bmp-js@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/bmp-js/-/bmp-js-0.1.0.tgz#e05a63f796a6c1ff25f4771ec7adadc148c07233"
@@ -6788,7 +9053,7 @@ body-parser@1.20.1:
     type-is "~1.6.18"
     unpipe "1.0.0"
 
-body-parser@^1.16.0:
+body-parser@1.20.2, body-parser@^1.16.0:
   version "1.20.2"
   resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.2.tgz#6feb0e21c4724d06de7ff38da36dad4f57a747fd"
   integrity sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==
@@ -6843,6 +9108,20 @@ borsh@^0.7.0:
     bs58 "^4.0.0"
     text-encoding-utf-8 "^1.0.2"
 
+boxen@7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/boxen/-/boxen-7.0.0.tgz#9e5f8c26e716793fc96edcf7cf754cdf5e3fbf32"
+  integrity sha512-j//dBVuyacJbvW+tvZ9HuH03fZ46QcaKvvhZickZqtB271DxJ7SNRSNxrV/dZX0085m7hISRZWbzWlJvx/rHSg==
+  dependencies:
+    ansi-align "^3.0.1"
+    camelcase "^7.0.0"
+    chalk "^5.0.1"
+    cli-boxes "^3.0.0"
+    string-width "^5.1.2"
+    type-fest "^2.13.0"
+    widest-line "^4.0.1"
+    wrap-ansi "^8.0.1"
+
 boxen@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/boxen/-/boxen-4.2.0.tgz#e411b62357d6d6d36587c8ac3d5d974daa070e64"
@@ -6968,6 +9247,23 @@ browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.16.6, browserslist@^4
     node-releases "^2.0.6"
     update-browserslist-db "^1.0.9"
 
+browserslist@^4.21.5:
+  version "4.21.9"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.9.tgz#e11bdd3c313d7e2a9e87e8b4b0c7872b13897635"
+  integrity sha512-M0MFoZzbUrRU4KNfCrDLnvyE7gub+peetoTid3TBIqtunaDJyXlwhakT+/VkvSXcfIzFfK/nkCs4nmyTmxdNSg==
+  dependencies:
+    caniuse-lite "^1.0.30001503"
+    electron-to-chromium "^1.4.431"
+    node-releases "^2.0.12"
+    update-browserslist-db "^1.0.11"
+
+bs-logger@0.x:
+  version "0.2.6"
+  resolved "https://registry.yarnpkg.com/bs-logger/-/bs-logger-0.2.6.tgz#eb7d365307a72cf974cc6cda76b68354ad336bd8"
+  integrity sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==
+  dependencies:
+    fast-json-stable-stringify "2.x"
+
 bs58@^4.0.0, bs58@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/bs58/-/bs58-4.0.1.tgz#be161e76c354f6f788ae4071f63f34e8c4f0a42a"
@@ -7014,6 +9310,11 @@ buffer-crc32@~0.2.3:
   resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
   integrity sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==
 
+buffer-equal-constant-time@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819"
+  integrity sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==
+
 buffer-equal@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-0.0.1.tgz#91bc74b11ea405bc916bc6aa908faafa5b4aac4b"
@@ -7122,6 +9423,11 @@ bytes@3.1.2:
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5"
   integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==
 
+cac@^6.7.14:
+  version "6.7.14"
+  resolved "https://registry.yarnpkg.com/cac/-/cac-6.7.14.tgz#804e1e6f506ee363cb0e3ccbb09cad5dd9870959"
+  integrity sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==
+
 cacheable-lookup@^5.0.3:
   version "5.0.4"
   resolved "https://registry.yarnpkg.com/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz#5a6b865b2c44357be3d5ebc2a467b032719a7005"
@@ -7227,6 +9533,11 @@ camelcase@^6.0.0, camelcase@^6.2.0, camelcase@^6.2.1:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a"
   integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
 
+camelcase@^7.0.0:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-7.0.1.tgz#f02e50af9fd7782bc8b88a3558c32fd3a388f048"
+  integrity sha512-xlx1yCK2Oc1APsPXDL2LdlNP6+uu8OCDdhOBSVT279M/S+y75O30C2VuD8T2ogdePBBl7PfPF4504tnLgX3zfw==
+
 camelize@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/camelize/-/camelize-1.0.1.tgz#89b7e16884056331a35d6b5ad064332c91daa6c3"
@@ -7247,6 +9558,11 @@ caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001400, caniuse-lite@^1.0.30001426:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001445.tgz#cf2d4eb93f2bcdf0310de9dd6d18be271bc0b447"
   integrity sha512-8sdQIdMztYmzfTMO6KfLny878Ln9c2M0fc7EH60IjlP4Dc4PiCy7K2Vl3ITmWgOyPgVQKa5x+UP/KqFsxj4mBg==
 
+caniuse-lite@^1.0.30001503:
+  version "1.0.30001504"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001504.tgz#eaf77e5c852dfa5f82c4924468c30602ac53744a"
+  integrity sha512-5uo7eoOp2mKbWyfMXnGO9rJWOGU8duvzEiYITW+wivukL7yHH4gX9yuRaobu6El4jPxo6jKZfG+N6fB621GD/Q==
+
 case-sensitive-paths-webpack-plugin@^2.4.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.4.0.tgz#db64066c6422eed2e08cc14b986ca43796dbc6d4"
@@ -7275,6 +9591,18 @@ chai@^4.3.7:
     pathval "^1.1.1"
     type-detect "^4.0.5"
 
+chalk-template@0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/chalk-template/-/chalk-template-0.4.0.tgz#692c034d0ed62436b9062c1707fadcd0f753204b"
+  integrity sha512-/ghrgmhfY8RaSdeo43hNXxpoHAtxdbskUHjPpfqUWGttFgycUhYPGx3YZBCnUCvOa7Doivn1IZec3DEGFoMgLg==
+  dependencies:
+    chalk "^4.1.2"
+
+chalk@5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.0.1.tgz#ca57d71e82bb534a296df63bbacc4a1c22b2a4b6"
+  integrity sha512-Fo07WOYGqMfCWHOzSXOt2CxDbC6skS/jO9ynEcmpANMoPrD+W1r1K6Vx7iNm+AQmETU1Xr2t+n8nzkV9t6xh3w==
+
 chalk@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
@@ -7311,6 +9639,11 @@ chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.2:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
+chalk@^5.0.1:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.2.0.tgz#249623b7d66869c673699fb66d65723e54dfcfb3"
+  integrity sha512-ree3Gqw/nazQAPuJJEy+avdl7QfZMcUvmHIKgEZkGL+xOBzRvup5Hxo6LHuMceSxOabuJLJm5Yp/92R9eMmMvA==
+
 char-regex@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf"
@@ -7351,7 +9684,7 @@ check-error@^1.0.2:
   resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82"
   integrity sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA==
 
-check-more-types@^2.24.0:
+check-more-types@2.24.0, check-more-types@^2.24.0:
   version "2.24.0"
   resolved "https://registry.yarnpkg.com/check-more-types/-/check-more-types-2.24.0.tgz#1420ffb10fd444dcfc79b43891bbfffd32a84600"
   integrity sha512-Pj779qHxV2tuapviy1bSZNEL1maXr13bPYpsvSDB68HlYcYuhlDrmGd63i0JHMCLKzc7rUSNIrpdJlhVlNwrxA==
@@ -7376,7 +9709,7 @@ chokidar@3.5.1:
   optionalDependencies:
     fsevents "~2.3.1"
 
-chokidar@3.5.3, chokidar@^3.4.2, chokidar@^3.5.2, chokidar@^3.5.3:
+chokidar@3.5.3, chokidar@^3.4.2, chokidar@^3.5.1, chokidar@^3.5.2, chokidar@^3.5.3:
   version "3.5.3"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
   integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==
@@ -7483,6 +9816,11 @@ cli-boxes@^2.2.0:
   resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f"
   integrity sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==
 
+cli-boxes@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-3.0.0.tgz#71a10c716feeba005e4504f36329ef0b17cf3145"
+  integrity sha512-/lzGpEWL/8PfI0BmBOPRwp0c/wFNX1RdUML3jK/RcSBA9T8mZDdQpqYBKtCFTOfQbwPqWEOpjqW+Fnayc0969g==
+
 cli-cursor@3.1.0, cli-cursor@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
@@ -7529,6 +9867,27 @@ cli-width@^3.0.0:
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6"
   integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==
 
+client-only@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/client-only/-/client-only-0.0.1.tgz#38bba5d403c41ab150bff64a95c85013cf73bca1"
+  integrity sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA==
+
+clipanion@3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/clipanion/-/clipanion-3.2.0.tgz#ea55ce3fe27becb4ddd4915df6fb3de0f9e79a5c"
+  integrity sha512-XaPQiJQZKbyaaDbv5yR/cAt/ORfZfENkr4wGQj+Go/Uf/65ofTQBCPirgWFeJctZW24V3mxrFiEnEmqBflrJYA==
+  dependencies:
+    typanion "^3.8.0"
+
+clipboardy@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/clipboardy/-/clipboardy-3.0.0.tgz#f3876247404d334c9ed01b6f269c11d09a5e3092"
+  integrity sha512-Su+uU5sr1jkUy1sGRpLKjKrvEOVXgSgiSInwa/qeID6aJ07yh+5NWc3h2QfjHjBnfX4LhtFcuAWKUsJ3r+fjbg==
+  dependencies:
+    arch "^2.2.0"
+    execa "^5.1.1"
+    is-wsl "^2.2.0"
+
 clipboardy@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/clipboardy/-/clipboardy-2.3.0.tgz#3c2903650c68e46a91b388985bc2774287dba290"
@@ -7619,6 +9978,11 @@ coa@^2.0.2:
     chalk "^2.4.1"
     q "^1.1.2"
 
+code-block-writer@^11.0.3:
+  version "11.0.3"
+  resolved "https://registry.yarnpkg.com/code-block-writer/-/code-block-writer-11.0.3.tgz#9eec2993edfb79bfae845fbc093758c0a0b73b76"
+  integrity sha512-NiujjUFB4SwScJq2bwbYUtXbZhBSlY6vYzm++3Q6oC+U+injTqfPYFK8wS9COOmb2lueqp0ZRB4nK1VYeHgNyw==
+
 code-point-at@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
@@ -7690,6 +10054,11 @@ colord@^2.9.1:
   resolved "https://registry.yarnpkg.com/colord/-/colord-2.9.3.tgz#4f8ce919de456f1d5c1c368c307fe20f3e59fb43"
   integrity sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==
 
+colorette@2.0.20:
+  version "2.0.20"
+  resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.20.tgz#9eb793e6833067f7235902fcd3b09917a000a95a"
+  integrity sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==
+
 colorette@^1.2.2:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.4.0.tgz#5190fbb87276259a86ad700bff2c6d6faa3fca40"
@@ -7710,6 +10079,11 @@ colors@^1.4.0:
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
   integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
 
+colors@~1.2.1:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-1.2.5.tgz#89c7ad9a374bc030df8013241f68136ed8835afc"
+  integrity sha512-erNRLao/Y3Fv54qUa0LBB+//Uf3YwMUmdJinN20yMXm9zdKKqH9wt7R9IIVZ+K7ShzfpLV/Zg8+VyrBJYB4lpg==
+
 combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
@@ -7747,6 +10121,11 @@ commander@7, commander@^7.2.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7"
   integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==
 
+commander@^10.0.0:
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-10.0.1.tgz#881ee46b4f77d1c1dccc5823433aa39b022cbe06"
+  integrity sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==
+
 commander@^2.15.0, commander@^2.20.0, commander@^2.20.3:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
@@ -7827,7 +10206,7 @@ compressible@~2.0.16:
   dependencies:
     mime-db ">= 1.43.0 < 2"
 
-compression@^1.7.4:
+compression@1.7.4, compression@^1.7.4:
   version "1.7.4"
   resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f"
   integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==
@@ -7855,6 +10234,20 @@ concat-stream@^2.0.0:
     readable-stream "^3.0.2"
     typedarray "^0.0.6"
 
+concordance@^5.0.4:
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/concordance/-/concordance-5.0.4.tgz#9896073261adced72f88d60e4d56f8efc4bbbbd2"
+  integrity sha512-OAcsnTEYu1ARJqWVGwf4zh4JDfHZEaSNlNccFmt8YjB2l/n19/PF2viLINHc57vO4FKIAFl2FWASIGZZWZ2Kxw==
+  dependencies:
+    date-time "^3.1.0"
+    esutils "^2.0.3"
+    fast-diff "^1.2.0"
+    js-string-escape "^1.0.1"
+    lodash "^4.17.15"
+    md5-hex "^3.0.1"
+    semver "^7.3.2"
+    well-known-symbols "^2.0.0"
+
 configstore@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/configstore/-/configstore-5.0.1.tgz#d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96"
@@ -7867,7 +10260,7 @@ configstore@^5.0.1:
     write-file-atomic "^3.0.0"
     xdg-basedir "^4.0.0"
 
-confusing-browser-globals@^1.0.11:
+confusing-browser-globals@^1.0.11, confusing-browser-globals@^1.0.9:
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz#ae40e9b57cdd3915408a2805ebd3a5585608dc81"
   integrity sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==
@@ -7882,6 +10275,11 @@ console-control-strings@^1.0.0, console-control-strings@~1.1.0:
   resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
   integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==
 
+content-disposition@0.5.2:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"
+  integrity sha512-kRGRZw3bLlFISDBgwTSA1TMBFN6J6GWDeubmDE3AF+3+yXL8hTWv8r5rkLbqYXY4RjPk/EzHnClI3zQf1cFmHA==
+
 content-disposition@0.5.4:
   version "0.5.4"
   resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe"
@@ -7942,6 +10340,11 @@ convert-source-map@^1.4.0, convert-source-map@^1.5.0, convert-source-map@^1.6.0,
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f"
   integrity sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==
 
+convert-source-map@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a"
+  integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==
+
 cookie-signature@1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
@@ -7957,6 +10360,14 @@ cookie@0.5.0:
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz#d1f5d71adec6558c58f389987c366aa47e994f8b"
   integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==
 
+cookies@0.8.0:
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/cookies/-/cookies-0.8.0.tgz#1293ce4b391740a8406e3c9870e828c4b54f3f90"
+  integrity sha512-8aPsApQfebXnuI+537McwYsDtjVxGm8gTIzQI3FDW6t5t/DAhERxtnbEPN/8RX+uZthoz4eCOgloXaE5cYyNow==
+  dependencies:
+    depd "~2.0.0"
+    keygrip "~1.1.0"
+
 copy-to-clipboard@^3.2.0, copy-to-clipboard@^3.3.1:
   version "3.3.3"
   resolved "https://registry.yarnpkg.com/copy-to-clipboard/-/copy-to-clipboard-3.3.3.tgz#55ac43a1db8ae639a4bd99511c148cdd1b83a1b0"
@@ -7971,11 +10382,23 @@ core-js-compat@^3.25.1:
   dependencies:
     browserslist "^4.21.4"
 
+core-js-compat@^3.30.1, core-js-compat@^3.30.2:
+  version "3.31.0"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.31.0.tgz#4030847c0766cc0e803dcdfb30055d7ef2064bf1"
+  integrity sha512-hM7YCu1cU6Opx7MXNu0NuumM0ezNeAeRKadixyiQELWY3vT3De9S4J5ZBMraWV2vZnrE1Cirl0GtFtDtMUXzPw==
+  dependencies:
+    browserslist "^4.21.5"
+
 core-js-pure@^3.23.3:
   version "3.27.1"
   resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.27.1.tgz#ede4a6b8440585c7190062757069c01d37a19dca"
   integrity sha512-BS2NHgwwUppfeoqOXqi08mUqS5FiZpuRuJJpKsaME7kJz0xxuk0xkhDdfMIlP/zLa80krBqss1LtD7f889heAw==
 
+core-js@3.30.2:
+  version "3.30.2"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.30.2.tgz#6528abfda65e5ad728143ea23f7a14f0dcf503fc"
+  integrity sha512-uBJiDmwqsbJCWHAwjrx3cvjbMXP7xD72Dmsn5LOJpiRmE3WbBbN5rCqQ2Qh6Ek6/eOrjlWngEynBWo4VxerQhg==
+
 core-js@^2.4.0:
   version "2.6.12"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec"
@@ -7996,7 +10419,7 @@ core-util-is@~1.0.0:
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
   integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
 
-cors@^2.8.1:
+cors@2.8.5, cors@^2.8.1:
   version "2.8.5"
   resolved "https://registry.yarnpkg.com/cors/-/cors-2.8.5.tgz#eac11da51592dd86b9f06f6e7ac293b3df875d29"
   integrity sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==
@@ -8004,6 +10427,11 @@ cors@^2.8.1:
     object-assign "^4"
     vary "^1"
 
+corser@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/corser/-/corser-2.0.1.tgz#8eda252ecaab5840dcd975ceb90d9370c819ff87"
+  integrity sha512-utCYNzRSQIZNPIcGZdQc92UVJYAhtGAteCFg0yRaFm8f0P+CPtyGyHXJcGXnffjCybUCEx3FQ2G7U3/o9eIkVQ==
+
 cosmiconfig-typescript-loader@^1.0.0:
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-1.0.9.tgz#69c523f7e8c3d9f27f563d02bbeadaf2f27212d3"
@@ -8057,6 +10485,16 @@ cosmiconfig@^8.0.0:
     parse-json "^5.0.0"
     path-type "^4.0.0"
 
+cosmiconfig@^8.1.3:
+  version "8.2.0"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-8.2.0.tgz#f7d17c56a590856cd1e7cee98734dca272b0d8fd"
+  integrity sha512-3rTMnFJA1tCOPwRxtgF4wd7Ab2qvDbL8jX+3smjIbS4HlZBagTlpERbdN7iAbWlrfxE3M8c27kTwTawQ7st+OQ==
+  dependencies:
+    import-fresh "^3.2.1"
+    js-yaml "^4.1.0"
+    parse-json "^5.0.0"
+    path-type "^4.0.0"
+
 craco-workbox@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/craco-workbox/-/craco-workbox-0.2.0.tgz#13e5c3c87c49a67d3d64ad6d636868c623cd7d89"
@@ -8276,6 +10714,17 @@ css-select@^4.1.3:
     domutils "^2.8.0"
     nth-check "^2.0.1"
 
+css-select@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/css-select/-/css-select-5.1.0.tgz#b8ebd6554c3637ccc76688804ad3f6a6fdaea8a6"
+  integrity sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==
+  dependencies:
+    boolbase "^1.0.0"
+    css-what "^6.1.0"
+    domhandler "^5.0.2"
+    domutils "^3.0.1"
+    nth-check "^2.0.1"
+
 css-to-react-native@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/css-to-react-native/-/css-to-react-native-3.1.0.tgz#e783474149997608986afcff614405714a8fe1ac"
@@ -8301,12 +10750,28 @@ css-tree@^1.1.2, css-tree@^1.1.3:
     mdn-data "2.0.14"
     source-map "^0.6.1"
 
+css-tree@^2.2.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-2.3.1.tgz#10264ce1e5442e8572fc82fbe490644ff54b5c20"
+  integrity sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==
+  dependencies:
+    mdn-data "2.0.30"
+    source-map-js "^1.0.1"
+
+css-tree@~2.2.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-2.2.1.tgz#36115d382d60afd271e377f9c5f67d02bd48c032"
+  integrity sha512-OA0mILzGc1kCOCSJerOeqDxDQ4HOh+G8NbOJFOTgOCzpw7fCBubk0fEyxp8AgOL/jvLgYA/uV0cMbe43ElF1JA==
+  dependencies:
+    mdn-data "2.0.28"
+    source-map-js "^1.0.1"
+
 css-what@^3.2.1:
   version "3.4.2"
   resolved "https://registry.yarnpkg.com/css-what/-/css-what-3.4.2.tgz#ea7026fcb01777edbde52124e21f327e7ae950e4"
   integrity sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ==
 
-css-what@^6.0.1:
+css-what@^6.0.1, css-what@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/css-what/-/css-what-6.1.0.tgz#fb5effcf76f1ddea2c81bdfaa4de44e79bac70f4"
   integrity sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==
@@ -8382,11 +10847,23 @@ csso@^4.0.2, csso@^4.2.0:
   dependencies:
     css-tree "^1.1.2"
 
+csso@^5.0.5:
+  version "5.0.5"
+  resolved "https://registry.yarnpkg.com/csso/-/csso-5.0.5.tgz#f9b7fe6cc6ac0b7d90781bb16d5e9874303e2ca6"
+  integrity sha512-0LrrStPOdJj+SPCCrGhzryycLjwcgUSHBtxNA8aIDxf0GLsRh1cKYhB00Gd1lDOS4yGH69+SNn13+TWbVHETFQ==
+  dependencies:
+    css-tree "~2.2.0"
+
 cssom@^0.4.4:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz#5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10"
   integrity sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==
 
+cssom@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.5.0.tgz#d254fa92cd8b6fbd83811b9fbaed34663cc17c36"
+  integrity sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw==
+
 cssom@~0.3.6:
   version "0.3.8"
   resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a"
@@ -8747,12 +11224,28 @@ data-urls@^2.0.0:
     whatwg-mimetype "^2.3.0"
     whatwg-url "^8.0.0"
 
+data-urls@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-3.0.2.tgz#9cf24a477ae22bcef5cd5f6f0bfbc1d2d3be9143"
+  integrity sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ==
+  dependencies:
+    abab "^2.0.6"
+    whatwg-mimetype "^3.0.0"
+    whatwg-url "^11.0.0"
+
 date-fns@^2.16.1, date-fns@^2.29.3:
   version "2.29.3"
   resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.29.3.tgz#27402d2fc67eb442b511b70bbdf98e6411cd68a8"
   integrity sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA==
 
-dayjs@^1.10.4:
+date-time@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/date-time/-/date-time-3.1.0.tgz#0d1e934d170579f481ed8df1e2b8ff70ee845e1e"
+  integrity sha512-uqCUKXE5q1PNBXjPqvwhwJf9SwMoAHBgWJ6DcrnS5o+W2JOiIILl0JEdVD8SGujrNS02GGxgwAg2PN2zONgtjg==
+  dependencies:
+    time-zone "^1.0.0"
+
+dayjs@1.11.7, dayjs@^1.10.4:
   version "1.11.7"
   resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.7.tgz#4b296922642f70999544d1144a2c25730fce63e2"
   integrity sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ==
@@ -8815,7 +11308,7 @@ decimal.js-light@^2.5.0:
   resolved "https://registry.yarnpkg.com/decimal.js-light/-/decimal.js-light-2.5.1.tgz#134fd32508f19e208f4fb2f8dac0d2626a867934"
   integrity sha512-qIMFpTMZmny+MMIitAB6D7iVPEorVw6YQRWkvarTkT4tBeSLLiHzcwj6q0MmYSFCiVpiqPJTJEYIrpcPzVEIvg==
 
-decimal.js@^10.2.1:
+decimal.js@^10.2.1, decimal.js@^10.4.2:
   version "10.4.3"
   resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.3.tgz#1044092884d245d1b7f65725fa4ad4c6f781cc23"
   integrity sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==
@@ -8889,6 +11382,11 @@ deepmerge@^4.2.2:
   resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
   integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==
 
+deepmerge@^4.3.1:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.3.1.tgz#44b5f2147cd3b00d4b56137685966f26fd25dd4a"
+  integrity sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==
+
 default-gateway@^6.0.3:
   version "6.0.3"
   resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-6.0.3.tgz#819494c888053bdb743edbf343d6cdf7f2943a71"
@@ -8958,7 +11456,7 @@ delimit-stream@0.1.0:
   resolved "https://registry.yarnpkg.com/delimit-stream/-/delimit-stream-0.1.0.tgz#9b8319477c0e5f8aeb3ce357ae305fc25ea1cd2b"
   integrity sha512-a02fiQ7poS5CnjiJBAsjGLPp5EwVoGHNeu9sziBd9huppRfsAFIpv5zNLv0V1gbop53ilngAf5Kf331AwcoRBQ==
 
-depd@2.0.0:
+depd@2.0.0, depd@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
   integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
@@ -9014,6 +11512,14 @@ detect-port-alt@^1.1.6:
     address "^1.0.1"
     debug "^2.6.0"
 
+detect-port@^1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/detect-port/-/detect-port-1.5.1.tgz#451ca9b6eaf20451acb0799b8ab40dff7718727b"
+  integrity sha512-aBzdj76lueB6uUst5iAs7+0H/oOjqI5D16XUWxlWMIMROhcM0rfsNVk93zTngq1dDNpoXRr++Sus7ETAExppAQ==
+  dependencies:
+    address "^1.0.1"
+    debug "4"
+
 detective@^5.2.1:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/detective/-/detective-5.2.1.tgz#6af01eeda11015acb0e73f933242b70f24f91034"
@@ -9038,6 +11544,11 @@ diff-sequences@^29.3.1:
   resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.3.1.tgz#104b5b95fe725932421a9c6e5b4bef84c3f2249e"
   integrity sha512-hlM3QR272NXCi4pq+N4Kok4kOp6EsgOM3ZSpJI7Da3UAs+Ttsi8MRmB6trM/lhyzUxGfOgnpkHtgqm5Q/CTcfQ==
 
+diff-sequences@^29.4.3:
+  version "29.4.3"
+  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.4.3.tgz#9314bc1fabe09267ffeca9cbafc457d8499a13f2"
+  integrity sha512-ofrBgwpPhCD85kMKtE9RYFFq6OC1A89oW2vvgWZNCwxrUpRUILopY7lsYyMDSjc8g6U6aiO0Qubg6r4Wgt5ZnA==
+
 diff@5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/diff/-/diff-5.0.0.tgz#7ed6ad76d859d030787ec35855f5b1daf31d852b"
@@ -9190,6 +11701,13 @@ domexception@^2.0.1:
   dependencies:
     webidl-conversions "^5.0.0"
 
+domexception@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/domexception/-/domexception-4.0.0.tgz#4ad1be56ccadc86fc76d033353999a8037d03673"
+  integrity sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==
+  dependencies:
+    webidl-conversions "^7.0.0"
+
 domhandler@^4.0.0, domhandler@^4.2.0, domhandler@^4.3.1:
   version "4.3.1"
   resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.3.1.tgz#8d792033416f59d68bc03a5aa7b018c1ca89279c"
@@ -9291,7 +11809,7 @@ duplexer3@^0.1.4:
   resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.5.tgz#0b5e4d7bad5de8901ea4440624c8e1d20099217e"
   integrity sha512-1A8za6ws41LQgv9HrE/66jyC5yuSjQ3L/KOpFtoBilsAK2iA2wuS5rTt1OCzIvtS2V7nVmedsUU+DGRcjBmOYA==
 
-duplexer@^0.1.1, duplexer@^0.1.2:
+duplexer@^0.1.1, duplexer@^0.1.2, duplexer@~0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6"
   integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==
@@ -9306,6 +11824,11 @@ duplexify@^4.1.2:
     readable-stream "^3.1.1"
     stream-shift "^1.0.0"
 
+eastasianwidth@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb"
+  integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==
+
 ecc-jsbn@~0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
@@ -9314,6 +11837,13 @@ ecc-jsbn@~0.1.1:
     jsbn "~0.1.0"
     safer-buffer "^2.1.0"
 
+ecdsa-sig-formatter@1.0.11:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz#ae0f0fa2d85045ef14a817daa3ce9acd0489e5bf"
+  integrity sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==
+  dependencies:
+    safe-buffer "^5.0.1"
+
 ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
@@ -9333,6 +11863,13 @@ ejs@^3.1.6:
   dependencies:
     jake "^10.8.5"
 
+ejs@^3.1.7:
+  version "3.1.9"
+  resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.9.tgz#03c9e8777fe12686a9effcef22303ca3d8eeb361"
+  integrity sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ==
+  dependencies:
+    jake "^10.8.5"
+
 electron-fetch@^1.7.2:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/electron-fetch/-/electron-fetch-1.9.1.tgz#e28bfe78d467de3f2dec884b1d72b8b05322f30f"
@@ -9345,6 +11882,11 @@ electron-to-chromium@^1.4.251:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz#61046d1e4cab3a25238f6bf7413795270f125592"
   integrity sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==
 
+electron-to-chromium@^1.4.431:
+  version "1.4.433"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.433.tgz#305ef5f8ea5fe65d252aae4b0e1088f9e4842533"
+  integrity sha512-MGO1k0w1RgrfdbLVwmXcDhHHuxCn2qRgR7dYsJvWFKDttvYPx6FNzCGG0c/fBBvzK2LDh3UV7Tt9awnHnvAAUQ==
+
 elliptic@6.5.4, elliptic@^6.4.0, elliptic@^6.5.2, elliptic@^6.5.3, elliptic@^6.5.4:
   version "6.5.4"
   resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb"
@@ -9368,6 +11910,11 @@ emittery@^0.10.2:
   resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.10.2.tgz#902eec8aedb8c41938c46e9385e9db7e03182933"
   integrity sha512-aITqOwnLanpHLNXZJENbOgjUBeHocD+xsSJmNrjovKBW5HbSpW3d1pEls7GFQPUWXiwG9+0P4GtHfEqC/4M0Iw==
 
+emittery@^0.13.1:
+  version "0.13.1"
+  resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.13.1.tgz#c04b8c3457490e0847ae51fced3af52d338e3dad"
+  integrity sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==
+
 emittery@^0.8.1:
   version "0.8.1"
   resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.8.1.tgz#bb23cc86d03b30aa75a7f734819dee2e1ba70860"
@@ -9477,7 +12024,12 @@ entities@^4.2.0, entities@^4.3.0:
   resolved "https://registry.yarnpkg.com/entities/-/entities-4.4.0.tgz#97bdaba170339446495e653cfd2db78962900174"
   integrity sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA==
 
-envinfo@^7.8.1:
+entities@^4.4.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48"
+  integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==
+
+envinfo@7.8.1, envinfo@^7.8.1:
   version "7.8.1"
   resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.8.1.tgz#06377e3e5f4d379fea7ac592d5ad8927e0c4d475"
   integrity sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==
@@ -9643,6 +12195,34 @@ es6-symbol@^3.1.1, es6-symbol@^3.1.3:
     d "^1.0.1"
     ext "^1.1.2"
 
+esbuild@^0.17.5:
+  version "0.17.19"
+  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.17.19.tgz#087a727e98299f0462a3d0bcdd9cd7ff100bd955"
+  integrity sha512-XQ0jAPFkK/u3LcVRcvVHQcTIqD6E2H1fvZMA5dQPSOWb3suUbWbfbRf94pjc0bNzRYLfIrDRQXr7X+LHIm5oHw==
+  optionalDependencies:
+    "@esbuild/android-arm" "0.17.19"
+    "@esbuild/android-arm64" "0.17.19"
+    "@esbuild/android-x64" "0.17.19"
+    "@esbuild/darwin-arm64" "0.17.19"
+    "@esbuild/darwin-x64" "0.17.19"
+    "@esbuild/freebsd-arm64" "0.17.19"
+    "@esbuild/freebsd-x64" "0.17.19"
+    "@esbuild/linux-arm" "0.17.19"
+    "@esbuild/linux-arm64" "0.17.19"
+    "@esbuild/linux-ia32" "0.17.19"
+    "@esbuild/linux-loong64" "0.17.19"
+    "@esbuild/linux-mips64el" "0.17.19"
+    "@esbuild/linux-ppc64" "0.17.19"
+    "@esbuild/linux-riscv64" "0.17.19"
+    "@esbuild/linux-s390x" "0.17.19"
+    "@esbuild/linux-x64" "0.17.19"
+    "@esbuild/netbsd-x64" "0.17.19"
+    "@esbuild/openbsd-x64" "0.17.19"
+    "@esbuild/sunos-x64" "0.17.19"
+    "@esbuild/win32-arm64" "0.17.19"
+    "@esbuild/win32-ia32" "0.17.19"
+    "@esbuild/win32-x64" "0.17.19"
+
 escalade@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
@@ -9736,6 +12316,27 @@ eslint-plugin-flowtype@^8.0.3:
     lodash "^4.17.21"
     string-natural-compare "^3.0.1"
 
+eslint-plugin-import@2.27.5:
+  version "2.27.5"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz#876a6d03f52608a3e5bb439c2550588e51dd6c65"
+  integrity sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==
+  dependencies:
+    array-includes "^3.1.6"
+    array.prototype.flat "^1.3.1"
+    array.prototype.flatmap "^1.3.1"
+    debug "^3.2.7"
+    doctrine "^2.1.0"
+    eslint-import-resolver-node "^0.3.7"
+    eslint-module-utils "^2.7.4"
+    has "^1.0.3"
+    is-core-module "^2.11.0"
+    is-glob "^4.0.3"
+    minimatch "^3.1.2"
+    object.values "^1.1.6"
+    resolve "^1.22.1"
+    semver "^6.3.0"
+    tsconfig-paths "^3.14.1"
+
 eslint-plugin-import@^2.25.3:
   version "2.27.4"
   resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.27.4.tgz#319c2f6f6580e1678d674a258ee5e981c10cc25b"
@@ -9764,7 +12365,7 @@ eslint-plugin-jest@^25.3.0:
   dependencies:
     "@typescript-eslint/experimental-utils" "^5.0.0"
 
-eslint-plugin-jsx-a11y@^6.5.1:
+eslint-plugin-jsx-a11y@6.7.1, eslint-plugin-jsx-a11y@^6.5.1:
   version "6.7.1"
   resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.7.1.tgz#fca5e02d115f48c9a597a6894d5bcec2f7a76976"
   integrity sha512-63Bog4iIethyo8smBklORknVjB0T2dwB8Mr/hIC+fBS0uyHdYYpzM/Ed+YC8VxTjlXHEWFOdmgwcDn1U2L9VCA==
@@ -9786,11 +12387,32 @@ eslint-plugin-jsx-a11y@^6.5.1:
     object.fromentries "^2.0.6"
     semver "^6.3.0"
 
-eslint-plugin-react-hooks@^4.3.0:
+eslint-plugin-react-hooks@4.6.0, eslint-plugin-react-hooks@^4.3.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz#4c3e697ad95b77e93f8646aaa1630c1ba607edd3"
   integrity sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==
 
+eslint-plugin-react@7.32.2:
+  version "7.32.2"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.32.2.tgz#e71f21c7c265ebce01bcbc9d0955170c55571f10"
+  integrity sha512-t2fBMa+XzonrrNkyVirzKlvn5RXzzPwRHtMvLAtVZrt8oxgnTQaYbU6SXTOO1mwQgp1y5+toMSKInnzGr0Knqg==
+  dependencies:
+    array-includes "^3.1.6"
+    array.prototype.flatmap "^1.3.1"
+    array.prototype.tosorted "^1.1.1"
+    doctrine "^2.1.0"
+    estraverse "^5.3.0"
+    jsx-ast-utils "^2.4.1 || ^3.0.0"
+    minimatch "^3.1.2"
+    object.entries "^1.1.6"
+    object.fromentries "^2.0.6"
+    object.hasown "^1.1.2"
+    object.values "^1.1.6"
+    prop-types "^15.8.1"
+    resolve "^2.0.0-next.4"
+    semver "^6.3.0"
+    string.prototype.matchall "^4.0.8"
+
 eslint-plugin-react@^7.27.1:
   version "7.32.0"
   resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.32.0.tgz#d80f794a638c5770f952ba2ae793f0a516be7c09"
@@ -9968,7 +12590,12 @@ estree-walker@^1.0.1:
   resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-1.0.1.tgz#31bc5d612c96b704106b477e6dd5d8aa138cb700"
   integrity sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==
 
-esutils@^2.0.2:
+estree-walker@^2.0.1, estree-walker@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-2.0.2.tgz#52f010178c2a4c117a7757cfe942adb7d2da4cac"
+  integrity sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==
+
+esutils@^2.0.2, esutils@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
   integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
@@ -10209,6 +12836,19 @@ ethjs-util@0.1.6, ethjs-util@^0.1.3:
     is-hex-prefixed "1.0.0"
     strip-hex-prefix "1.0.0"
 
+event-stream@=3.3.4:
+  version "3.3.4"
+  resolved "https://registry.yarnpkg.com/event-stream/-/event-stream-3.3.4.tgz#4ab4c9a0f5a54db9338b4c34d86bfce8f4b35571"
+  integrity sha512-QHpkERcGsR0T7Qm3HNJSyXKEEj8AHNxkY3PK8TS2KJvQ7NiSHe3DDpwVKKtoYprL/AreyzFBeIkBIWChAqn60g==
+  dependencies:
+    duplexer "~0.1.1"
+    from "~0"
+    map-stream "~0.1.0"
+    pause-stream "0.0.11"
+    split "0.3"
+    stream-combiner "~0.0.4"
+    through "~2.3.1"
+
 event-target-shim@^5.0.0:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789"
@@ -10262,6 +12902,21 @@ execa@4.1.0:
     signal-exit "^3.0.2"
     strip-final-newline "^2.0.0"
 
+execa@5.1.1, execa@^5.0.0, execa@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"
+  integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==
+  dependencies:
+    cross-spawn "^7.0.3"
+    get-stream "^6.0.0"
+    human-signals "^2.1.0"
+    is-stream "^2.0.0"
+    merge-stream "^2.0.0"
+    npm-run-path "^4.0.1"
+    onetime "^5.1.2"
+    signal-exit "^3.0.3"
+    strip-final-newline "^2.0.0"
+
 execa@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777"
@@ -10288,21 +12943,6 @@ execa@^1.0.0:
     signal-exit "^3.0.0"
     strip-eof "^1.0.0"
 
-execa@^5.0.0:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"
-  integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==
-  dependencies:
-    cross-spawn "^7.0.3"
-    get-stream "^6.0.0"
-    human-signals "^2.1.0"
-    is-stream "^2.0.0"
-    merge-stream "^2.0.0"
-    npm-run-path "^4.0.1"
-    onetime "^5.1.2"
-    signal-exit "^3.0.3"
-    strip-final-newline "^2.0.0"
-
 executable@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/executable/-/executable-4.1.1.tgz#41532bff361d3e57af4d763b70582db18f5d133c"
@@ -10346,12 +12986,28 @@ expect@^29.0.0:
     jest-message-util "^29.3.1"
     jest-util "^29.3.1"
 
+expect@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-29.5.0.tgz#68c0509156cb2a0adb8865d413b137eeaae682f7"
+  integrity sha512-yM7xqUrCO2JdpFo4XpM82t+PJBFybdqoQuJLDGeDX2ij8NZzqRHyu3Hp188/JX7SWqud+7t4MUdvcgGBICMHZg==
+  dependencies:
+    "@jest/expect-utils" "^29.5.0"
+    jest-get-type "^29.4.3"
+    jest-matcher-utils "^29.5.0"
+    jest-message-util "^29.5.0"
+    jest-util "^29.5.0"
+
 exponential-backoff@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/exponential-backoff/-/exponential-backoff-3.1.1.tgz#64ac7526fe341ab18a39016cd22c787d01e00bf6"
   integrity sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==
 
-express@^4.14.0, express@^4.17.2, express@^4.17.3:
+express-rate-limit@5.5.1:
+  version "5.5.1"
+  resolved "https://registry.yarnpkg.com/express-rate-limit/-/express-rate-limit-5.5.1.tgz#110c23f6a65dfa96ab468eda95e71697bc6987a2"
+  integrity sha512-MTjE2eIbHv5DyfuFz4zLYWxpqVhEhkTiwFGuB74Q9CSou2WHO52nlE5y3Zlg6SIsiYUIPj6ifFxnkPz6O3sIUg==
+
+express@4.18.2, express@^4.14.0, express@^4.17.2, express@^4.17.3:
   version "4.18.2"
   resolved "https://registry.yarnpkg.com/express/-/express-4.18.2.tgz#3fabe08296e930c796c19e3c516979386ba9fd59"
   integrity sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==
@@ -10455,6 +13111,11 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
+fast-diff@^1.2.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.3.0.tgz#ece407fa550a64d638536cd727e129c61616e0f0"
+  integrity sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==
+
 fast-fifo@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/fast-fifo/-/fast-fifo-1.1.0.tgz#17d1a3646880b9891dfa0c54e69c5fef33cad779"
@@ -10482,7 +13143,7 @@ fast-glob@^3.2.12, fast-glob@^3.2.9:
     merge2 "^1.3.0"
     micromatch "^4.0.4"
 
-fast-json-stable-stringify@^2.0.0, fast-json-stable-stringify@^2.1.0:
+fast-json-stable-stringify@2.x, fast-json-stable-stringify@^2.0.0, fast-json-stable-stringify@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
   integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
@@ -10497,7 +13158,7 @@ fast-redact@^3.0.0:
   resolved "https://registry.yarnpkg.com/fast-redact/-/fast-redact-3.1.2.tgz#d58e69e9084ce9fa4c1a6fa98a3e1ecf5d7839aa"
   integrity sha512-+0em+Iya9fKGfEQGcd62Yv6onjBmmhV1uh86XVfOU8VwAe6kaFdQCWI9s0/Nnugx5Vd9tdbZ7e6gE2tR9dzXdw==
 
-fast-safe-stringify@^2.0.6, fast-safe-stringify@^2.0.8:
+fast-safe-stringify@2.1.1, fast-safe-stringify@^2.0.6, fast-safe-stringify@^2.0.8:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz#c406a83b6e70d9e35ce3b30a81141df30aeba884"
   integrity sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==
@@ -10507,6 +13168,13 @@ fast-stable-stringify@^1.0.0:
   resolved "https://registry.yarnpkg.com/fast-stable-stringify/-/fast-stable-stringify-1.0.0.tgz#5c5543462b22aeeefd36d05b34e51c78cb86d313"
   integrity sha512-wpYMUmFu5f00Sm0cj2pfivpmawLZ0NKdviQ4w9zJeR8JVtOpOxHmLaJuj0vxvGqMJQWyP/COUkF75/57OKyRag==
 
+fast-url-parser@1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/fast-url-parser/-/fast-url-parser-1.1.3.tgz#f4af3ea9f34d8a271cf58ad2b3759f431f0b318d"
+  integrity sha512-5jOCVXADYNuRkKFzNJ0dCCewsZiYo0dz8QNYljkOpFC6r2U4OBmKtvm/Tsuh4w1YYdDqDb31a8TVhBJ2OJKdqQ==
+  dependencies:
+    punycode "^1.3.2"
+
 fastq@^1.6.0:
   version "1.15.0"
   resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.15.0.tgz#d04d07c6a2a68fe4599fea8d2e103a937fae6b3a"
@@ -10535,6 +13203,11 @@ fd-slicer@~1.1.0:
   dependencies:
     pend "~1.2.0"
 
+fflate@^0.7.4:
+  version "0.7.4"
+  resolved "https://registry.yarnpkg.com/fflate/-/fflate-0.7.4.tgz#61587e5d958fdabb5a9368a302c25363f4f69f50"
+  integrity sha512-5u2V/CDW15QM1XbbgS+0DfPxVB+jUKhWEKuuFuHncbk3tEEqzmoXL+2KyOFuKGqOnmdIy0/davWF1CkuwtibCw==
+
 figures@3.2.0, figures@^3.0.0, figures@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af"
@@ -10680,7 +13353,7 @@ flatmap@0.0.3:
   resolved "https://registry.yarnpkg.com/flatmap/-/flatmap-0.0.3.tgz#1f18a4d938152d495965f9c958d923ab2dd669b4"
   integrity sha512-OuR+o7kHVe+x9RtIujPay7Uw3bvDZBZFSBXClEphZuSDLmZTqMdclasf4vFSsogC8baDz0eaC2NdO/2dlXHBKQ==
 
-flatted@^3.1.0:
+flatted@^3.1.0, flatted@^3.2.7:
   version "3.2.7"
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.7.tgz#609f39207cb614b89d0765b477cb2d437fbf9787"
   integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==
@@ -10699,7 +13372,7 @@ follow-redirects@1.5.10:
   dependencies:
     debug "=3.1.0"
 
-follow-redirects@^1.0.0, follow-redirects@^1.14.0, follow-redirects@^1.15.0:
+follow-redirects@^1.0.0, follow-redirects@^1.14.0, follow-redirects@^1.14.9, follow-redirects@^1.15.0:
   version "1.15.2"
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13"
   integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==
@@ -10794,6 +13467,11 @@ fresh@0.5.2:
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
   integrity sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==
 
+from@~0:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/from/-/from-0.1.7.tgz#83c60afc58b9c56997007ed1a768b3ab303a44fe"
+  integrity sha512-twe20eF1OxVxp/ML/kq2p1uc6KvFK/+vs8WjEbeKmV2He22MKm7YF2ANIt+EOqhJ5L3K/SuuPhk0hWQDjOM23g==
+
 fs-constants@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
@@ -10808,7 +13486,7 @@ fs-extra@10.0.0:
     jsonfile "^6.0.1"
     universalify "^2.0.0"
 
-fs-extra@^10.0.0:
+fs-extra@^10.0.0, fs-extra@^10.1.0:
   version "10.1.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf"
   integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==
@@ -10835,7 +13513,7 @@ fs-extra@^4.0.2:
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
-fs-extra@^7.0.0:
+fs-extra@^7.0.0, fs-extra@~7.0.1:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
   integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==
@@ -11218,6 +13896,11 @@ globby@^11.0.4, globby@^11.1.0:
     merge2 "^1.4.1"
     slash "^3.0.0"
 
+globrex@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/globrex/-/globrex-0.1.2.tgz#dd5d9ec826232730cd6793a5e33a9302985e6098"
+  integrity sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==
+
 gopd@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c"
@@ -11283,6 +13966,11 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0,
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
   integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
 
+graceful-fs@^4.1.3:
+  version "4.2.11"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
+  integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
+
 grapheme-splitter@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e"
@@ -11322,6 +14010,18 @@ handle-thing@^2.0.0:
   resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e"
   integrity sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==
 
+handlebars@4.7.7:
+  version "4.7.7"
+  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.7.tgz#9ce33416aad02dbd6c8fafa8240d5d98004945a1"
+  integrity sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==
+  dependencies:
+    minimist "^1.2.5"
+    neo-async "^2.6.0"
+    source-map "^0.6.1"
+    wordwrap "^1.0.0"
+  optionalDependencies:
+    uglify-js "^3.1.4"
+
 har-schema@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
@@ -11504,6 +14204,13 @@ html-encoding-sniffer@^2.0.1:
   dependencies:
     whatwg-encoding "^1.0.5"
 
+html-encoding-sniffer@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz#2cb1a8cf0db52414776e5b2a7a04d5dd98158de9"
+  integrity sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==
+  dependencies:
+    whatwg-encoding "^2.0.0"
+
 html-entities@^2.1.0, html-entities@^2.3.2:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.3.3.tgz#117d7626bece327fc8baace8868fa6f5ef856e46"
@@ -11617,6 +14324,15 @@ http-proxy-agent@^4.0.1:
     agent-base "6"
     debug "4"
 
+http-proxy-agent@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43"
+  integrity sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==
+  dependencies:
+    "@tootallnate/once" "2"
+    agent-base "6"
+    debug "4"
+
 http-proxy-middleware@^2.0.1, http-proxy-middleware@^2.0.3:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz#e1a4dd6979572c7ab5a4e4b55095d1f32a74963f"
@@ -11637,6 +14353,25 @@ http-proxy@^1.18.1:
     follow-redirects "^1.0.0"
     requires-port "^1.0.0"
 
+http-server@^14.1.0:
+  version "14.1.1"
+  resolved "https://registry.yarnpkg.com/http-server/-/http-server-14.1.1.tgz#d60fbb37d7c2fdff0f0fbff0d0ee6670bd285e2e"
+  integrity sha512-+cbxadF40UXd9T01zUHgA+rlo2Bg1Srer4+B4NwIHdaGxAGGv59nYRnGGDJ9LBk7alpS0US+J+bLLdQOOkJq4A==
+  dependencies:
+    basic-auth "^2.0.1"
+    chalk "^4.1.2"
+    corser "^2.0.1"
+    he "^1.2.0"
+    html-encoding-sniffer "^3.0.0"
+    http-proxy "^1.18.1"
+    mime "^1.6.0"
+    minimist "^1.2.6"
+    opener "^1.5.1"
+    portfinder "^1.0.28"
+    secure-compare "3.0.1"
+    union "~0.5.0"
+    url-join "^4.0.1"
+
 http-signature@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
@@ -11655,6 +14390,11 @@ http-signature@~1.3.6:
     jsprim "^2.0.2"
     sshpk "^1.14.1"
 
+http-status-codes@2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/http-status-codes/-/http-status-codes-2.2.0.tgz#bb2efe63d941dfc2be18e15f703da525169622be"
+  integrity sha512-feERVo9iWxvnejp3SEfm/+oNG517npqL2/PIA8ORjyOZjGC7TwCRQsZylciLS64i6pJ0wRYz3rkXLRwbtFa8Ng==
+
 http2-wrapper@^1.0.0-beta.5.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/http2-wrapper/-/http2-wrapper-1.0.3.tgz#b8f55e0c1f25d4ebd08b3b0c2c079f9590800b3d"
@@ -11676,7 +14416,7 @@ https-browserify@^1.0.0:
   resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
   integrity sha512-J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg==
 
-https-proxy-agent@^5.0.0:
+https-proxy-agent@5.0.1, https-proxy-agent@^5.0.0, https-proxy-agent@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6"
   integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==
@@ -11722,7 +14462,7 @@ iconv-lite@0.4.24, iconv-lite@^0.4.24:
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
-iconv-lite@0.6, iconv-lite@^0.6.2, iconv-lite@^0.6.3:
+iconv-lite@0.6, iconv-lite@0.6.3, iconv-lite@^0.6.2, iconv-lite@^0.6.3:
   version "0.6.3"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501"
   integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==
@@ -11739,7 +14479,7 @@ idb@^7.0.1:
   resolved "https://registry.yarnpkg.com/idb/-/idb-7.1.1.tgz#d910ded866d32c7ced9befc5bfdf36f572ced72b"
   integrity sha512-gchesWBzyvGHRO9W8tzUWFDycow5gwjvFKfyV9FF32Y7F50yZMp7mP+T2mJIWFx49zicqyC4uefHM17o6xKIVQ==
 
-identity-obj-proxy@^3.0.0:
+identity-obj-proxy@3.0.0, identity-obj-proxy@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/identity-obj-proxy/-/identity-obj-proxy-3.0.0.tgz#94d2bda96084453ef36fbc5aaec37e0f79f1fc14"
   integrity sha512-00n6YnVHKrinT9t0d9+5yZC6UBNJANpYEQvL2LlX6Ab9lnmxzIRcEmTPuyGScvl1+jKuCICX1Z0Ab1pPKKdikA==
@@ -11795,6 +14535,11 @@ import-lazy@^2.1.0:
   resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43"
   integrity sha512-m7ZEHgtw69qOGw+jwxXkHlrlIPdTGkyh66zXZ1ajZbxkDBNjSY/LGbmjc7h0s2ELsUDTAhFr55TrPSSqJGPG0A==
 
+import-lazy@~4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-4.0.0.tgz#e8eb627483a0a43da3c03f3e35548be5cb0cc153"
+  integrity sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==
+
 import-local@^3.0.2:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.1.0.tgz#b4479df8a5fd44f6cdce24070675676063c95cb4"
@@ -12372,6 +15117,13 @@ is-circular@^1.0.2:
   resolved "https://registry.yarnpkg.com/is-circular/-/is-circular-1.0.2.tgz#2e0ab4e9835f4c6b0ea2b9855a84acd501b8366c"
   integrity sha512-YttjnrswnUYRVJvxCvu8z+PGMUSzC2JttP0OEXezlAEdp3EXzhf7IZ3j0gRAybJBQupedIZFhY61Tga6E0qASA==
 
+is-core-module@^2.1.0:
+  version "2.12.1"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.12.1.tgz#0c0b6885b6f80011c71541ce15c8d66cf5a4f9fd"
+  integrity sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==
+  dependencies:
+    has "^1.0.3"
+
 is-core-module@^2.11.0, is-core-module@^2.5.0, is-core-module@^2.9.0:
   version "2.11.0"
   resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.11.0.tgz#ad4cb3e3863e814523c96f3f58d26cc570ff0144"
@@ -12574,11 +15326,21 @@ is-plain-object@^2.0.4:
   dependencies:
     isobject "^3.0.1"
 
+is-port-reachable@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/is-port-reachable/-/is-port-reachable-4.0.0.tgz#dac044091ef15319c8ab2f34604d8794181f8c2d"
+  integrity sha512-9UoipoxYmSk6Xy7QFgRv2HDyaysmgSG75TFQs6S+3pDM7ZhKTF/bskZV+0UlABHzKjNVhPjYCLfeZUEg1wXxig==
+
 is-potential-custom-element-name@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5"
   integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==
 
+is-promise@^2.1.0:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.2.2.tgz#39ab959ccbf9a774cf079f7b40c7a26f763135f1"
+  integrity sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==
+
 is-pull-stream@0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/is-pull-stream/-/is-pull-stream-0.0.0.tgz#a3bc3d1c6d3055151c46bde6f399efed21440ca9"
@@ -12985,6 +15747,14 @@ jest-changed-files@^27.5.1:
     execa "^5.0.0"
     throat "^6.0.1"
 
+jest-changed-files@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-29.5.0.tgz#e88786dca8bf2aa899ec4af7644e16d9dcf9b23e"
+  integrity sha512-IFG34IUMUaNBIxjQXF/iu7g6EcdMrGRRxaUSw92I/2g2YC6vCdTltl4nHvt7Ci5nSJwXIkCu8Ka1DKF+X7Z1Ag==
+  dependencies:
+    execa "^5.0.0"
+    p-limit "^3.1.0"
+
 jest-circus@^27.5.1:
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-27.5.1.tgz#37a5a4459b7bf4406e53d637b49d22c65d125ecc"
@@ -13010,6 +15780,32 @@ jest-circus@^27.5.1:
     stack-utils "^2.0.3"
     throat "^6.0.1"
 
+jest-circus@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-29.5.0.tgz#b5926989449e75bff0d59944bae083c9d7fb7317"
+  integrity sha512-gq/ongqeQKAplVxqJmbeUOJJKkW3dDNPY8PjhJ5G0lBRvu0e3EWGxGy5cI4LAGA7gV2UHCtWBI4EMXK8c9nQKA==
+  dependencies:
+    "@jest/environment" "^29.5.0"
+    "@jest/expect" "^29.5.0"
+    "@jest/test-result" "^29.5.0"
+    "@jest/types" "^29.5.0"
+    "@types/node" "*"
+    chalk "^4.0.0"
+    co "^4.6.0"
+    dedent "^0.7.0"
+    is-generator-fn "^2.0.0"
+    jest-each "^29.5.0"
+    jest-matcher-utils "^29.5.0"
+    jest-message-util "^29.5.0"
+    jest-runtime "^29.5.0"
+    jest-snapshot "^29.5.0"
+    jest-util "^29.5.0"
+    p-limit "^3.1.0"
+    pretty-format "^29.5.0"
+    pure-rand "^6.0.0"
+    slash "^3.0.0"
+    stack-utils "^2.0.3"
+
 jest-cli@^27.5.1:
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-27.5.1.tgz#278794a6e6458ea8029547e6c6cbf673bd30b145"
@@ -13028,6 +15824,24 @@ jest-cli@^27.5.1:
     prompts "^2.0.1"
     yargs "^16.2.0"
 
+jest-cli@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-29.5.0.tgz#b34c20a6d35968f3ee47a7437ff8e53e086b4a67"
+  integrity sha512-L1KcP1l4HtfwdxXNFCL5bmUbLQiKrakMUriBEcc1Vfz6gx31ORKdreuWvmQVBit+1ss9NNR3yxjwfwzZNdQXJw==
+  dependencies:
+    "@jest/core" "^29.5.0"
+    "@jest/test-result" "^29.5.0"
+    "@jest/types" "^29.5.0"
+    chalk "^4.0.0"
+    exit "^0.1.2"
+    graceful-fs "^4.2.9"
+    import-local "^3.0.2"
+    jest-config "^29.5.0"
+    jest-util "^29.5.0"
+    jest-validate "^29.5.0"
+    prompts "^2.0.1"
+    yargs "^17.3.1"
+
 jest-config@^27.5.1:
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-27.5.1.tgz#5c387de33dca3f99ad6357ddeccd91bf3a0e4a41"
@@ -13054,7 +15868,35 @@ jest-config@^27.5.1:
     jest-validate "^27.5.1"
     micromatch "^4.0.4"
     parse-json "^5.2.0"
-    pretty-format "^27.5.1"
+    pretty-format "^27.5.1"
+    slash "^3.0.0"
+    strip-json-comments "^3.1.1"
+
+jest-config@^29.4.1, jest-config@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-29.5.0.tgz#3cc972faec8c8aaea9ae158c694541b79f3748da"
+  integrity sha512-kvDUKBnNJPNBmFFOhDbm59iu1Fii1Q6SxyhXfvylq3UTHbg6o7j/g8k2dZyXWLvfdKB1vAPxNZnMgtKJcmu3kA==
+  dependencies:
+    "@babel/core" "^7.11.6"
+    "@jest/test-sequencer" "^29.5.0"
+    "@jest/types" "^29.5.0"
+    babel-jest "^29.5.0"
+    chalk "^4.0.0"
+    ci-info "^3.2.0"
+    deepmerge "^4.2.2"
+    glob "^7.1.3"
+    graceful-fs "^4.2.9"
+    jest-circus "^29.5.0"
+    jest-environment-node "^29.5.0"
+    jest-get-type "^29.4.3"
+    jest-regex-util "^29.4.3"
+    jest-resolve "^29.5.0"
+    jest-runner "^29.5.0"
+    jest-util "^29.5.0"
+    jest-validate "^29.5.0"
+    micromatch "^4.0.4"
+    parse-json "^5.2.0"
+    pretty-format "^29.5.0"
     slash "^3.0.0"
     strip-json-comments "^3.1.1"
 
@@ -13078,6 +15920,16 @@ jest-diff@^29.3.1:
     jest-get-type "^29.2.0"
     pretty-format "^29.3.1"
 
+jest-diff@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-29.5.0.tgz#e0d83a58eb5451dcc1fa61b1c3ee4e8f5a290d63"
+  integrity sha512-LtxijLLZBduXnHSniy0WMdaHjmQnt3g5sa16W4p0HqukYTTsyTW3GD1q41TyGl5YFXj/5B2U6dlh5FM1LIMgxw==
+  dependencies:
+    chalk "^4.0.0"
+    diff-sequences "^29.4.3"
+    jest-get-type "^29.4.3"
+    pretty-format "^29.5.0"
+
 jest-docblock@^27.5.1:
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-27.5.1.tgz#14092f364a42c6108d42c33c8cf30e058e25f6c0"
@@ -13085,6 +15937,13 @@ jest-docblock@^27.5.1:
   dependencies:
     detect-newline "^3.0.0"
 
+jest-docblock@^29.4.3:
+  version "29.4.3"
+  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-29.4.3.tgz#90505aa89514a1c7dceeac1123df79e414636ea8"
+  integrity sha512-fzdTftThczeSD9nZ3fzA/4KkHtnmllawWrXO69vtI+L9WjEIuXWs4AmyME7lN5hU7dB0sHhuPfcKofRsUb/2Fg==
+  dependencies:
+    detect-newline "^3.0.0"
+
 jest-each@^27.5.1:
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-27.5.1.tgz#5bc87016f45ed9507fed6e4702a5b468a5b2c44e"
@@ -13096,6 +15955,17 @@ jest-each@^27.5.1:
     jest-util "^27.5.1"
     pretty-format "^27.5.1"
 
+jest-each@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-29.5.0.tgz#fc6e7014f83eac68e22b7195598de8554c2e5c06"
+  integrity sha512-HM5kIJ1BTnVt+DQZ2ALp3rzXEl+g726csObrW/jpEGl+CDSSQpOJJX2KE/vEg8cxcMXdyEPu6U4QX5eruQv5hA==
+  dependencies:
+    "@jest/types" "^29.5.0"
+    chalk "^4.0.0"
+    jest-get-type "^29.4.3"
+    jest-util "^29.5.0"
+    pretty-format "^29.5.0"
+
 jest-environment-jsdom@^27.5.1:
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-27.5.1.tgz#ea9ccd1fc610209655a77898f86b2b559516a546"
@@ -13109,6 +15979,20 @@ jest-environment-jsdom@^27.5.1:
     jest-util "^27.5.1"
     jsdom "^16.6.0"
 
+jest-environment-jsdom@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-29.5.0.tgz#cfe86ebaf1453f3297b5ff3470fbe94739c960cb"
+  integrity sha512-/KG8yEK4aN8ak56yFVdqFDzKNHgF4BAymCx2LbPNPsUshUlfAl0eX402Xm1pt+eoG9SLZEUVifqXtX8SK74KCw==
+  dependencies:
+    "@jest/environment" "^29.5.0"
+    "@jest/fake-timers" "^29.5.0"
+    "@jest/types" "^29.5.0"
+    "@types/jsdom" "^20.0.0"
+    "@types/node" "*"
+    jest-mock "^29.5.0"
+    jest-util "^29.5.0"
+    jsdom "^20.0.0"
+
 jest-environment-node@^27.5.1:
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-27.5.1.tgz#dedc2cfe52fab6b8f5714b4808aefa85357a365e"
@@ -13121,6 +16005,18 @@ jest-environment-node@^27.5.1:
     jest-mock "^27.5.1"
     jest-util "^27.5.1"
 
+jest-environment-node@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-29.5.0.tgz#f17219d0f0cc0e68e0727c58b792c040e332c967"
+  integrity sha512-ExxuIK/+yQ+6PRGaHkKewYtg6hto2uGCgvKdb2nfJfKXgZ17DfXjvbZ+jA1Qt9A8EQSfPnt5FKIfnOO3u1h9qw==
+  dependencies:
+    "@jest/environment" "^29.5.0"
+    "@jest/fake-timers" "^29.5.0"
+    "@jest/types" "^29.5.0"
+    "@types/node" "*"
+    jest-mock "^29.5.0"
+    jest-util "^29.5.0"
+
 jest-fetch-mock@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/jest-fetch-mock/-/jest-fetch-mock-3.0.3.tgz#31749c456ae27b8919d69824f1c2bd85fe0a1f3b"
@@ -13144,6 +16040,11 @@ jest-get-type@^29.2.0:
   resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-29.2.0.tgz#726646f927ef61d583a3b3adb1ab13f3a5036408"
   integrity sha512-uXNJlg8hKFEnDgFsrCjznB+sTxdkuqiCL6zMgA75qEbAJjJYTs9XPrvDctrEig2GDow22T/LvHgO57iJhXB/UA==
 
+jest-get-type@^29.4.3:
+  version "29.4.3"
+  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-29.4.3.tgz#1ab7a5207c995161100b5187159ca82dd48b3dd5"
+  integrity sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==
+
 jest-haste-map@^27.5.1:
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-27.5.1.tgz#9fd8bd7e7b4fa502d9c6164c5640512b4e811e7f"
@@ -13164,6 +16065,25 @@ jest-haste-map@^27.5.1:
   optionalDependencies:
     fsevents "^2.3.2"
 
+jest-haste-map@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-29.5.0.tgz#69bd67dc9012d6e2723f20a945099e972b2e94de"
+  integrity sha512-IspOPnnBro8YfVYSw6yDRKh/TiCdRngjxeacCps1cQ9cgVN6+10JUcuJ1EabrgYLOATsIAigxA0rLR9x/YlrSA==
+  dependencies:
+    "@jest/types" "^29.5.0"
+    "@types/graceful-fs" "^4.1.3"
+    "@types/node" "*"
+    anymatch "^3.0.3"
+    fb-watchman "^2.0.0"
+    graceful-fs "^4.2.9"
+    jest-regex-util "^29.4.3"
+    jest-util "^29.5.0"
+    jest-worker "^29.5.0"
+    micromatch "^4.0.4"
+    walker "^1.0.8"
+  optionalDependencies:
+    fsevents "^2.3.2"
+
 jest-jasmine2@^27.5.1:
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-27.5.1.tgz#a037b0034ef49a9f3d71c4375a796f3b230d1ac4"
@@ -13195,7 +16115,15 @@ jest-leak-detector@^27.5.1:
     jest-get-type "^27.5.1"
     pretty-format "^27.5.1"
 
-jest-matcher-utils@^27.0.0, jest-matcher-utils@^27.5.1:
+jest-leak-detector@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-29.5.0.tgz#cf4bdea9615c72bac4a3a7ba7e7930f9c0610c8c"
+  integrity sha512-u9YdeeVnghBUtpN5mVxjID7KbkKE1QU4f6uUwuxiY0vYRi9BUCLKlPEZfDGR67ofdFmDz9oPAy2G92Ujrntmow==
+  dependencies:
+    jest-get-type "^29.4.3"
+    pretty-format "^29.5.0"
+
+jest-matcher-utils@^27.5.1:
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-27.5.1.tgz#9c0cdbda8245bc22d2331729d1091308b40cf8ab"
   integrity sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw==
@@ -13215,6 +16143,16 @@ jest-matcher-utils@^29.3.1:
     jest-get-type "^29.2.0"
     pretty-format "^29.3.1"
 
+jest-matcher-utils@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-29.5.0.tgz#d957af7f8c0692c5453666705621ad4abc2c59c5"
+  integrity sha512-lecRtgm/rjIK0CQ7LPQwzCs2VwW6WAahA55YBuI+xqmhm7LAaxokSB8C97yJeYyT+HvQkH741StzpU41wohhWw==
+  dependencies:
+    chalk "^4.0.0"
+    jest-diff "^29.5.0"
+    jest-get-type "^29.4.3"
+    pretty-format "^29.5.0"
+
 jest-message-util@^27.5.1:
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-27.5.1.tgz#bdda72806da10d9ed6425e12afff38cd1458b6cf"
@@ -13260,6 +16198,21 @@ jest-message-util@^29.3.1:
     slash "^3.0.0"
     stack-utils "^2.0.3"
 
+jest-message-util@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-29.5.0.tgz#1f776cac3aca332ab8dd2e3b41625435085c900e"
+  integrity sha512-Kijeg9Dag6CKtIDA7O21zNTACqD5MD/8HfIV8pdD94vFyFuer52SigdC3IQMhab3vACxXMiFk+yMHNdbqtyTGA==
+  dependencies:
+    "@babel/code-frame" "^7.12.13"
+    "@jest/types" "^29.5.0"
+    "@types/stack-utils" "^2.0.0"
+    chalk "^4.0.0"
+    graceful-fs "^4.2.9"
+    micromatch "^4.0.4"
+    pretty-format "^29.5.0"
+    slash "^3.0.0"
+    stack-utils "^2.0.3"
+
 jest-mock@^27.5.1:
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-27.5.1.tgz#19948336d49ef4d9c52021d34ac7b5f36ff967d6"
@@ -13268,6 +16221,15 @@ jest-mock@^27.5.1:
     "@jest/types" "^27.5.1"
     "@types/node" "*"
 
+jest-mock@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-29.5.0.tgz#26e2172bcc71d8b0195081ff1f146ac7e1518aed"
+  integrity sha512-GqOzvdWDE4fAV2bWQLQCkujxYWL7RxjCnj71b5VhDAGOevB3qj3Ovg26A5NI84ZpODxyzaozXLOh2NCgkbvyaw==
+  dependencies:
+    "@jest/types" "^29.5.0"
+    "@types/node" "*"
+    jest-util "^29.5.0"
+
 jest-pnp-resolver@^1.2.2:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz#930b1546164d4ad5937d5540e711d4d38d4cad2e"
@@ -13283,6 +16245,11 @@ jest-regex-util@^28.0.0:
   resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-28.0.2.tgz#afdc377a3b25fb6e80825adcf76c854e5bf47ead"
   integrity sha512-4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw==
 
+jest-regex-util@^29.4.3:
+  version "29.4.3"
+  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-29.4.3.tgz#a42616141e0cae052cfa32c169945d00c0aa0bb8"
+  integrity sha512-O4FglZaMmWXbGHSQInfXewIsd1LMn9p3ZXB/6r4FOkyhX2/iP/soMG98jGvk/A3HAN78+5VWcBGO0BJAPRh4kg==
+
 jest-resolve-dependencies@^27.5.1:
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-27.5.1.tgz#d811ecc8305e731cc86dd79741ee98fed06f1da8"
@@ -13292,6 +16259,14 @@ jest-resolve-dependencies@^27.5.1:
     jest-regex-util "^27.5.1"
     jest-snapshot "^27.5.1"
 
+jest-resolve-dependencies@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-29.5.0.tgz#f0ea29955996f49788bf70996052aa98e7befee4"
+  integrity sha512-sjV3GFr0hDJMBpYeUuGduP+YeCRbd7S/ck6IvL3kQ9cpySYKqcqhdLLC2rFwrcL7tz5vYibomBrsFYWkIGGjOg==
+  dependencies:
+    jest-regex-util "^29.4.3"
+    jest-snapshot "^29.5.0"
+
 jest-resolve@^27.4.2, jest-resolve@^27.5.1:
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-27.5.1.tgz#a2f1c5a0796ec18fe9eb1536ac3814c23617b384"
@@ -13308,6 +16283,21 @@ jest-resolve@^27.4.2, jest-resolve@^27.5.1:
     resolve.exports "^1.1.0"
     slash "^3.0.0"
 
+jest-resolve@^29.4.1, jest-resolve@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-29.5.0.tgz#b053cc95ad1d5f6327f0ac8aae9f98795475ecdc"
+  integrity sha512-1TzxJ37FQq7J10jPtQjcc+MkCkE3GBpBecsSUWJ0qZNJpmg6m0D9/7II03yJulm3H/fvVjgqLh/k2eYg+ui52w==
+  dependencies:
+    chalk "^4.0.0"
+    graceful-fs "^4.2.9"
+    jest-haste-map "^29.5.0"
+    jest-pnp-resolver "^1.2.2"
+    jest-util "^29.5.0"
+    jest-validate "^29.5.0"
+    resolve "^1.20.0"
+    resolve.exports "^2.0.0"
+    slash "^3.0.0"
+
 jest-runner@^27.5.1:
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-27.5.1.tgz#071b27c1fa30d90540805c5645a0ec167c7b62e5"
@@ -13335,6 +16325,33 @@ jest-runner@^27.5.1:
     source-map-support "^0.5.6"
     throat "^6.0.1"
 
+jest-runner@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-29.5.0.tgz#6a57c282eb0ef749778d444c1d758c6a7693b6f8"
+  integrity sha512-m7b6ypERhFghJsslMLhydaXBiLf7+jXy8FwGRHO3BGV1mcQpPbwiqiKUR2zU2NJuNeMenJmlFZCsIqzJCTeGLQ==
+  dependencies:
+    "@jest/console" "^29.5.0"
+    "@jest/environment" "^29.5.0"
+    "@jest/test-result" "^29.5.0"
+    "@jest/transform" "^29.5.0"
+    "@jest/types" "^29.5.0"
+    "@types/node" "*"
+    chalk "^4.0.0"
+    emittery "^0.13.1"
+    graceful-fs "^4.2.9"
+    jest-docblock "^29.4.3"
+    jest-environment-node "^29.5.0"
+    jest-haste-map "^29.5.0"
+    jest-leak-detector "^29.5.0"
+    jest-message-util "^29.5.0"
+    jest-resolve "^29.5.0"
+    jest-runtime "^29.5.0"
+    jest-util "^29.5.0"
+    jest-watcher "^29.5.0"
+    jest-worker "^29.5.0"
+    p-limit "^3.1.0"
+    source-map-support "0.5.13"
+
 jest-runtime@^27.5.1:
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-27.5.1.tgz#4896003d7a334f7e8e4a53ba93fb9bcd3db0a1af"
@@ -13363,6 +16380,34 @@ jest-runtime@^27.5.1:
     slash "^3.0.0"
     strip-bom "^4.0.0"
 
+jest-runtime@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-29.5.0.tgz#c83f943ee0c1da7eb91fa181b0811ebd59b03420"
+  integrity sha512-1Hr6Hh7bAgXQP+pln3homOiEZtCDZFqwmle7Ew2j8OlbkIu6uE3Y/etJQG8MLQs3Zy90xrp2C0BRrtPHG4zryw==
+  dependencies:
+    "@jest/environment" "^29.5.0"
+    "@jest/fake-timers" "^29.5.0"
+    "@jest/globals" "^29.5.0"
+    "@jest/source-map" "^29.4.3"
+    "@jest/test-result" "^29.5.0"
+    "@jest/transform" "^29.5.0"
+    "@jest/types" "^29.5.0"
+    "@types/node" "*"
+    chalk "^4.0.0"
+    cjs-module-lexer "^1.0.0"
+    collect-v8-coverage "^1.0.0"
+    glob "^7.1.3"
+    graceful-fs "^4.2.9"
+    jest-haste-map "^29.5.0"
+    jest-message-util "^29.5.0"
+    jest-mock "^29.5.0"
+    jest-regex-util "^29.4.3"
+    jest-resolve "^29.5.0"
+    jest-snapshot "^29.5.0"
+    jest-util "^29.5.0"
+    slash "^3.0.0"
+    strip-bom "^4.0.0"
+
 jest-serializer@^27.5.1:
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-27.5.1.tgz#81438410a30ea66fd57ff730835123dea1fb1f64"
@@ -13399,6 +16444,35 @@ jest-snapshot@^27.5.1:
     pretty-format "^27.5.1"
     semver "^7.3.2"
 
+jest-snapshot@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-29.5.0.tgz#c9c1ce0331e5b63cd444e2f95a55a73b84b1e8ce"
+  integrity sha512-x7Wolra5V0tt3wRs3/ts3S6ciSQVypgGQlJpz2rsdQYoUKxMxPNaoHMGJN6qAuPJqS+2iQ1ZUn5kl7HCyls84g==
+  dependencies:
+    "@babel/core" "^7.11.6"
+    "@babel/generator" "^7.7.2"
+    "@babel/plugin-syntax-jsx" "^7.7.2"
+    "@babel/plugin-syntax-typescript" "^7.7.2"
+    "@babel/traverse" "^7.7.2"
+    "@babel/types" "^7.3.3"
+    "@jest/expect-utils" "^29.5.0"
+    "@jest/transform" "^29.5.0"
+    "@jest/types" "^29.5.0"
+    "@types/babel__traverse" "^7.0.6"
+    "@types/prettier" "^2.1.5"
+    babel-preset-current-node-syntax "^1.0.0"
+    chalk "^4.0.0"
+    expect "^29.5.0"
+    graceful-fs "^4.2.9"
+    jest-diff "^29.5.0"
+    jest-get-type "^29.4.3"
+    jest-matcher-utils "^29.5.0"
+    jest-message-util "^29.5.0"
+    jest-util "^29.5.0"
+    natural-compare "^1.4.0"
+    pretty-format "^29.5.0"
+    semver "^7.3.5"
+
 jest-styled-components@^7.1.1:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/jest-styled-components/-/jest-styled-components-7.1.1.tgz#faf19c733e0de4bbef1f9151955b99e839b7df48"
@@ -13430,6 +16504,18 @@ jest-util@^28.1.3:
     graceful-fs "^4.2.9"
     picomatch "^2.2.3"
 
+jest-util@^29.0.0, jest-util@^29.4.1, jest-util@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.5.0.tgz#24a4d3d92fc39ce90425311b23c27a6e0ef16b8f"
+  integrity sha512-RYMgG/MTadOr5t8KdhejfvUU82MxsCu5MF6KuDUHl+NuwzUt+Sm6jJWxTJVrDR1j5M/gJVCPKQEpWXY+yIQ6lQ==
+  dependencies:
+    "@jest/types" "^29.5.0"
+    "@types/node" "*"
+    chalk "^4.0.0"
+    ci-info "^3.2.0"
+    graceful-fs "^4.2.9"
+    picomatch "^2.2.3"
+
 jest-util@^29.3.1:
   version "29.3.1"
   resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.3.1.tgz#1dda51e378bbcb7e3bc9d8ab651445591ed373e1"
@@ -13466,6 +16552,18 @@ jest-validate@^27.5.1:
     leven "^3.1.0"
     pretty-format "^27.5.1"
 
+jest-validate@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-29.5.0.tgz#8e5a8f36178d40e47138dc00866a5f3bd9916ffc"
+  integrity sha512-pC26etNIi+y3HV8A+tUGr/lph9B18GnzSRAkPaaZJIE1eFdiYm6/CewuiJQ8/RlfHd1u/8Ioi8/sJ+CmbA+zAQ==
+  dependencies:
+    "@jest/types" "^29.5.0"
+    camelcase "^6.2.0"
+    chalk "^4.0.0"
+    jest-get-type "^29.4.3"
+    leven "^3.1.0"
+    pretty-format "^29.5.0"
+
 jest-watch-typeahead@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/jest-watch-typeahead/-/jest-watch-typeahead-1.1.0.tgz#b4a6826dfb9c9420da2f7bc900de59dad11266a9"
@@ -13506,6 +16604,20 @@ jest-watcher@^28.0.0:
     jest-util "^28.1.3"
     string-length "^4.0.1"
 
+jest-watcher@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-29.5.0.tgz#cf7f0f949828ba65ddbbb45c743a382a4d911363"
+  integrity sha512-KmTojKcapuqYrKDpRwfqcQ3zjMlwu27SYext9pt4GlF5FUgB+7XE1mcCnSm6a4uUpFyQIkb6ZhzZvHl+jiBCiA==
+  dependencies:
+    "@jest/test-result" "^29.5.0"
+    "@jest/types" "^29.5.0"
+    "@types/node" "*"
+    ansi-escapes "^4.2.1"
+    chalk "^4.0.0"
+    emittery "^0.13.1"
+    jest-util "^29.5.0"
+    string-length "^4.0.1"
+
 jest-worker@^26.2.1:
   version "26.6.2"
   resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed"
@@ -13533,6 +16645,16 @@ jest-worker@^28.0.2:
     merge-stream "^2.0.0"
     supports-color "^8.0.0"
 
+jest-worker@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-29.5.0.tgz#bdaefb06811bd3384d93f009755014d8acb4615d"
+  integrity sha512-NcrQnevGoSp4b5kg+akIpthoAFHxPBcb5P6mYPY0fUNT+sSvmtu6jlkEle3anczUKIKEbMxFimk9oTP/tpIPgA==
+  dependencies:
+    "@types/node" "*"
+    jest-util "^29.5.0"
+    merge-stream "^2.0.0"
+    supports-color "^8.0.0"
+
 jest@^27.4.3:
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/jest/-/jest-27.5.1.tgz#dadf33ba70a779be7a6fc33015843b51494f63fc"
@@ -13542,6 +16664,32 @@ jest@^27.4.3:
     import-local "^3.0.2"
     jest-cli "^27.5.1"
 
+jest@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/jest/-/jest-29.5.0.tgz#f75157622f5ce7ad53028f2f8888ab53e1f1f24e"
+  integrity sha512-juMg3he2uru1QoXX078zTa7pO85QyB9xajZc6bU+d9yEGwrKX6+vGmJQ3UdVZsvTEUARIdObzH68QItim6OSSQ==
+  dependencies:
+    "@jest/core" "^29.5.0"
+    "@jest/types" "^29.5.0"
+    import-local "^3.0.2"
+    jest-cli "^29.5.0"
+
+jju@~1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/jju/-/jju-1.4.0.tgz#a3abe2718af241a2b2904f84a625970f389ae32a"
+  integrity sha512-8wb9Yw966OSxApiCt0K3yNJL8pnNeIv+OEq2YMidz4FKP6nonSRoOXc80iXY4JaN2FC11B9qsNmDsm+ZOfMROA==
+
+joi@^17.7.0:
+  version "17.9.2"
+  resolved "https://registry.yarnpkg.com/joi/-/joi-17.9.2.tgz#8b2e4724188369f55451aebd1d0b1d9482470690"
+  integrity sha512-Itk/r+V4Dx0V3c7RLFdRh12IOjySm2/WGPMubBT92cQvRfYZhPM2W0hZlctjj72iES8jsRCwp7S/cRmWBnJ4nw==
+  dependencies:
+    "@hapi/hoek" "^9.0.0"
+    "@hapi/topo" "^5.0.0"
+    "@sideway/address" "^4.1.3"
+    "@sideway/formula" "^3.0.1"
+    "@sideway/pinpoint" "^2.0.0"
+
 jotai@1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/jotai/-/jotai-1.7.0.tgz#b22e4cb995270a0215564990eeacc804025eb557"
@@ -13567,6 +16715,11 @@ js-sha3@^0.5.7:
   resolved "https://registry.yarnpkg.com/js-sha3/-/js-sha3-0.5.7.tgz#0d4ffd8002d5333aabaf4a23eed2f6374c9f28e7"
   integrity sha512-GII20kjaPX0zJ8wzkTbNDYMY7msuZcTWk8S5UOh6806Jq/wz1J8/bnr8uGU0DAUmYDjj2Mr4X1cW8v/GLYnR+g==
 
+js-string-escape@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/js-string-escape/-/js-string-escape-1.0.1.tgz#e2625badbc0d67c7533e9edc1068c587ae4137ef"
+  integrity sha512-Smw4xcfIQ5LVjAOuJCvN/zIodzA/BBSsluuoSykP+lUvScIi4U6RJLfwHet5cxFnCswUjISV8oAXaqaJDY3chg==
+
 "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
@@ -13635,6 +16788,38 @@ jsdom@^16.6.0:
     ws "^7.4.6"
     xml-name-validator "^3.0.0"
 
+jsdom@^20.0.0, jsdom@~20.0.3:
+  version "20.0.3"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-20.0.3.tgz#886a41ba1d4726f67a8858028c99489fed6ad4db"
+  integrity sha512-SYhBvTh89tTfCD/CRdSOm13mOBa42iTaTyfyEWBdKcGdPxPtLFBXuHR8XHb33YNYaP+lLbmSvBTsnoesCNJEsQ==
+  dependencies:
+    abab "^2.0.6"
+    acorn "^8.8.1"
+    acorn-globals "^7.0.0"
+    cssom "^0.5.0"
+    cssstyle "^2.3.0"
+    data-urls "^3.0.2"
+    decimal.js "^10.4.2"
+    domexception "^4.0.0"
+    escodegen "^2.0.0"
+    form-data "^4.0.0"
+    html-encoding-sniffer "^3.0.0"
+    http-proxy-agent "^5.0.0"
+    https-proxy-agent "^5.0.1"
+    is-potential-custom-element-name "^1.0.1"
+    nwsapi "^2.2.2"
+    parse5 "^7.1.1"
+    saxes "^6.0.0"
+    symbol-tree "^3.2.4"
+    tough-cookie "^4.1.2"
+    w3c-xmlserializer "^4.0.0"
+    webidl-conversions "^7.0.0"
+    whatwg-encoding "^2.0.0"
+    whatwg-mimetype "^3.0.0"
+    whatwg-url "^11.0.0"
+    ws "^8.11.0"
+    xml-name-validator "^4.0.0"
+
 jsesc@^2.5.1:
   version "2.5.2"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
@@ -13732,12 +16917,12 @@ json5@^1.0.1:
   dependencies:
     minimist "^1.2.0"
 
-json5@^2.1.2, json5@^2.2.0, json5@^2.2.2:
+json5@^2.1.2, json5@^2.2.0, json5@^2.2.2, json5@^2.2.3:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
   integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
 
-jsonc-parser@3.2.0:
+jsonc-parser@3.2.0, jsonc-parser@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.2.0.tgz#31ff3f4c2b9793f89c67212627c51c6394f88e76"
   integrity sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==
@@ -13773,6 +16958,16 @@ jsonpointer@^5.0.0:
   resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-5.0.1.tgz#2110e0af0900fd37467b5907ecd13a7884a1b559"
   integrity sha512-p/nXbhSEcu3pZRdkW1OfJhpsVtW1gd4Wa1fnQc9YLiTfAjn0312eMKimbdIQzuZl9aa9xUGaRlP9T/CJE/ditQ==
 
+jsonwebtoken@9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-9.0.0.tgz#d0faf9ba1cc3a56255fe49c0961a67e520c1926d"
+  integrity sha512-tuGfYXxkQGDPnLJ7SibiQgVgeDgfbPq2k2ICcbgqW8WxWLBAxKQM/ZCu/IT8SOSwmaYl4dpTFCW5xZv7YbbWUw==
+  dependencies:
+    jws "^3.2.2"
+    lodash "^4.17.21"
+    ms "^2.1.1"
+    semver "^7.3.8"
+
 jsprim@^1.2.2:
   version "1.4.2"
   resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.2.tgz#712c65533a15c878ba59e9ed5f0e26d5b77c5feb"
@@ -13806,6 +17001,23 @@ just-performance@4.3.0:
   resolved "https://registry.yarnpkg.com/just-performance/-/just-performance-4.3.0.tgz#cc2bc8c9227f09e97b6b1df4cd0de2df7ae16db1"
   integrity sha512-L7RjvtJsL0QO8xFs5wEoDDzzJwoiowRw6Rn/GnvldlchS2JQr9wFYPiwZcDfrbbujEKqKN0tvENdbjXdYhDp5Q==
 
+jwa@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/jwa/-/jwa-1.4.1.tgz#743c32985cb9e98655530d53641b66c8645b039a"
+  integrity sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==
+  dependencies:
+    buffer-equal-constant-time "1.0.1"
+    ecdsa-sig-formatter "1.0.11"
+    safe-buffer "^5.0.1"
+
+jws@^3.2.2:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/jws/-/jws-3.2.2.tgz#001099f3639468c9414000e99995fa52fb478304"
+  integrity sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==
+  dependencies:
+    jwa "^1.4.1"
+    safe-buffer "^5.0.1"
+
 keccak@^3.0.0, keccak@^3.0.1:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/keccak/-/keccak-3.0.3.tgz#4bc35ad917be1ef54ff246f904c2bbbf9ac61276"
@@ -13815,6 +17027,13 @@ keccak@^3.0.0, keccak@^3.0.1:
     node-gyp-build "^4.2.0"
     readable-stream "^3.6.0"
 
+keygrip@~1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/keygrip/-/keygrip-1.1.0.tgz#871b1681d5e159c62a445b0c74b615e0917e7226"
+  integrity sha512-iYSchDJ+liQ8iwbSI2QqsQOvqv58eJCEanyJPJi+Khyu8smkcKSFUCbPwzFcL7YVtZ6eONjqRX/38caJ7QjRAQ==
+  dependencies:
+    tsscmp "1.0.6"
+
 keyv@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9"
@@ -13846,6 +17065,11 @@ klaw-sync@^6.0.0:
   dependencies:
     graceful-fs "^4.1.11"
 
+kleur@4.1.5:
+  version "4.1.5"
+  resolved "https://registry.yarnpkg.com/kleur/-/kleur-4.1.5.tgz#95106101795f7050c6c650f350c683febddb1780"
+  integrity sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==
+
 kleur@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
@@ -13856,6 +17080,11 @@ klona@^2.0.4, klona@^2.0.5:
   resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.5.tgz#d166574d90076395d9963aa7a928fabb8d76afbc"
   integrity sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==
 
+kolorist@^1.6.0:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/kolorist/-/kolorist-1.8.0.tgz#edddbbbc7894bc13302cdf740af6374d4a04743c"
+  integrity sha512-Y+60/zizpJ3HRH8DCss+q95yr6145JXZo46OTpFvDZWLfRCE4qChOyk1b26nMaNpfHHgxagk9dXT5OP0Tfe+dQ==
+
 language-subtag-registry@~0.3.2:
   version "0.3.22"
   resolved "https://registry.yarnpkg.com/language-subtag-registry/-/language-subtag-registry-0.3.22.tgz#2e1500861b2e457eba7e7ae86877cbd08fa1fd1d"
@@ -13901,7 +17130,7 @@ launchdarkly-react-client-sdk@^3.0.4:
     launchdarkly-js-client-sdk "^3.1.2"
     lodash.camelcase "^4.3.0"
 
-lazy-ass@^1.6.0:
+lazy-ass@1.6.0, lazy-ass@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/lazy-ass/-/lazy-ass-1.6.0.tgz#7999655e8646c17f089fdd187d150d3324d54513"
   integrity sha512-cc8oEVoctTvsFZ/Oje/kGnHbpWHYBe8IAJe4C0QNc3t8uM/0Y8+erSz/7Y1ALuXTEZTMvxXwO6YbX1ey3ujiZw==
@@ -14013,6 +17242,11 @@ loader-utils@^3.2.0:
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-3.2.1.tgz#4fb104b599daafd82ef3e1a41fb9265f87e1f576"
   integrity sha512-ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw==
 
+local-pkg@^0.4.3:
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/local-pkg/-/local-pkg-0.4.3.tgz#0ff361ab3ae7f1c19113d9bb97b98b905dbc4963"
+  integrity sha512-SFppqq5p42fe2qcZQqqEOiVRXl+WCP1MdT6k7BDEW1j++sp5fIY+/fdRQitvKgB5BrBcmrs5m/L0v2FrU5MY1g==
+
 locate-path@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
@@ -14043,6 +17277,18 @@ locate-path@^6.0.0:
   dependencies:
     p-locate "^5.0.0"
 
+lockfile@1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/lockfile/-/lockfile-1.0.4.tgz#07f819d25ae48f87e538e6578b6964a4981a5609"
+  integrity sha512-cvbTwETRfsFh4nHsL1eGWapU1XFi5Ot9E85sWAwia7Y7EgB7vfqcZhTKZ+l7hCGxSPoushMv5GKhT5PdLv03WA==
+  dependencies:
+    signal-exit "^3.0.2"
+
+lodash-es@^4.17.21:
+  version "4.17.21"
+  resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee"
+  integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==
+
 lodash.camelcase@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
@@ -14063,7 +17309,7 @@ lodash.get@^4.4.2:
   resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
   integrity sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==
 
-lodash.isequal@4.5.0:
+lodash.isequal@4.5.0, lodash.isequal@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
   integrity sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==
@@ -14083,7 +17329,7 @@ lodash.kebabcase@^4.1.1:
   resolved "https://registry.yarnpkg.com/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz#8489b1cb0d29ff88195cceca448ff6d6cc295c36"
   integrity sha512-N8XRTIMMqqDgSy4VLKPnJ/+hpGZN+PHQiJnSenYqPaVV/NCqEogTnAdZLQiGKhxX+JCs8waWq2t1XHWKOmlY8g==
 
-lodash.memoize@^4.1.2:
+lodash.memoize@4.x, lodash.memoize@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
   integrity sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==
@@ -14128,7 +17374,7 @@ lodash.upperfirst@^4.3.1:
   resolved "https://registry.yarnpkg.com/lodash.upperfirst/-/lodash.upperfirst-4.3.1.tgz#1365edf431480481ef0d1c68957a5ed99d49f7ce"
   integrity sha512-sReKOYJIJf74dhJONhU4e0/shzi1trVbSWDOhKYE5XV2O+H7Sb2Dihwuc7xWxVl+DgFPyTqIN3zMfT9cq5iWDg==
 
-lodash@4.17.21, lodash@^4.17.11, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.7.0:
+lodash@4, lodash@4.17.21, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.7.0, lodash@~4.17.15:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -14178,13 +17424,24 @@ loud-rejection@^1.0.0:
     currently-unhandled "^0.4.1"
     signal-exit "^3.0.0"
 
-loupe@^2.3.1:
+loupe@^2.3.1, loupe@^2.3.6:
   version "2.3.6"
   resolved "https://registry.yarnpkg.com/loupe/-/loupe-2.3.6.tgz#76e4af498103c532d1ecc9be102036a21f787b53"
   integrity sha512-RaPMZKiMy8/JruncMU5Bt6na1eftNoo++R4Y+N2FrxkDVTrGvcyzFTsaGif4QTeKESheMGegbhw6iUAq+5A8zA==
   dependencies:
     get-func-name "^2.0.0"
 
+lowdb@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/lowdb/-/lowdb-1.0.0.tgz#5243be6b22786ccce30e50c9a33eac36b20c8064"
+  integrity sha512-2+x8esE/Wb9SQ1F9IHaYWfsC9FIecLOPrK4g17FGEayjUWH172H6nwicRovGvSE2CPZouc2MCIqCI7h9d+GftQ==
+  dependencies:
+    graceful-fs "^4.1.3"
+    is-promise "^2.1.0"
+    lodash "4"
+    pify "^3.0.0"
+    steno "^0.4.1"
+
 lower-case@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.2.tgz#6fa237c63dbdc4a82ca0fd882e4722dc5e634e28"
@@ -14207,6 +17464,11 @@ lowercase-keys@^3.0.0:
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-3.0.0.tgz#c5e7d442e37ead247ae9db117a9d0a467c89d4f2"
   integrity sha512-ozCC6gdQ+glXOQsveKD0YsDy8DSQFjDTz4zyzEHNV5+JP5D62LmfDZ6o1cycFx9ouG940M5dE8C8CTewdj2YWQ==
 
+lru-cache@7.18.3:
+  version "7.18.3"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.18.3.tgz#f793896e0fd0e954a59dfdd82f0773808df6aa89"
+  integrity sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==
+
 lru-cache@^4.0.1:
   version "4.1.5"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
@@ -14229,10 +17491,10 @@ lru-cache@^6.0.0:
   dependencies:
     yallist "^4.0.0"
 
-lz-string@^1.4.4:
-  version "1.4.4"
-  resolved "https://registry.yarnpkg.com/lz-string/-/lz-string-1.4.4.tgz#c0d8eaf36059f705796e1e344811cf4c498d3a26"
-  integrity sha512-0ckx7ZHRPqb0oUm8zNr+90mtf9DQB60H1wMCjBtfi62Kl3a7JbHob6gA2bC+xRvZoOL+1hzUK8jeuEIQE8svEQ==
+lz-string@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/lz-string/-/lz-string-1.5.0.tgz#c1ab50f77887b712621201ba9fd4e3a6ed099941"
+  integrity sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==
 
 magic-string@^0.25.0, magic-string@^0.25.7:
   version "0.25.9"
@@ -14241,6 +17503,20 @@ magic-string@^0.25.0, magic-string@^0.25.7:
   dependencies:
     sourcemap-codec "^1.4.8"
 
+magic-string@^0.27.0:
+  version "0.27.0"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.27.0.tgz#e4a3413b4bab6d98d2becffd48b4a257effdbbf3"
+  integrity sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA==
+  dependencies:
+    "@jridgewell/sourcemap-codec" "^1.4.13"
+
+magic-string@^0.30.0:
+  version "0.30.0"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.0.tgz#fd58a4748c5c4547338a424e90fa5dd17f4de529"
+  integrity sha512-LA+31JYDJLs82r2ScLrlz1GjSgu66ZV518eyWT+S8VhyQn/JL0u9MeBOvQMGYiPk1DBiSN9DDMOcXvigJZaViQ==
+  dependencies:
+    "@jridgewell/sourcemap-codec" "^1.4.13"
+
 make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
@@ -14248,7 +17524,7 @@ make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0:
   dependencies:
     semver "^6.0.0"
 
-make-error@^1.1.1:
+make-error@1.x, make-error@^1.1.1:
   version "1.3.6"
   resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
   integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
@@ -14292,6 +17568,18 @@ map-obj@^4.0.0:
   resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-4.3.0.tgz#9304f906e93faae70880da102a9f1df0ea8bb05a"
   integrity sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==
 
+map-stream@~0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.1.0.tgz#e56aa94c4c8055a16404a0674b78f215f7c8e194"
+  integrity sha512-CkYQrPYZfWnu/DAmVCpTSX/xHpKZ80eKh2lAkyA6AJTef6bW+6JpbQZN5rofum7da+SyN1bi5ctTm+lTfcCW3g==
+
+md5-hex@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/md5-hex/-/md5-hex-3.0.1.tgz#be3741b510591434b2784d79e556eefc2c9a8e5c"
+  integrity sha512-BUiRtTtV39LIJwinWBjqVsU9xhdnz7/i889V859IBFpuqGAj6LuOvHv5XLbgZ2R7ptJoJaEcxkv88/h25T7Ciw==
+  dependencies:
+    blueimp-md5 "^2.10.0"
+
 md5.js@^1.3.4:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f"
@@ -14338,6 +17626,16 @@ mdn-data@2.0.14:
   resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50"
   integrity sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==
 
+mdn-data@2.0.28:
+  version "2.0.28"
+  resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.28.tgz#5ec48e7bef120654539069e1ae4ddc81ca490eba"
+  integrity sha512-aylIc7Z9y4yzHYAJNuESG3hfhC+0Ibp/MAMiaOZgNv4pmEdFyfZhhhny4MNiAfWdBQ1RQ2mfDWmM1x8SvGyp8g==
+
+mdn-data@2.0.30:
+  version "2.0.30"
+  resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.30.tgz#ce4df6f80af6cfbe218ecd5c552ba13c4dfa08cc"
+  integrity sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==
+
 mdn-data@2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.4.tgz#699b3c38ac6f1d728091a64650b65d388502fd5b"
@@ -14528,6 +17826,18 @@ mime-db@1.52.0, "mime-db@>= 1.43.0 < 2":
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
   integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
 
+mime-db@~1.33.0:
+  version "1.33.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db"
+  integrity sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ==
+
+mime-types@2.1.18:
+  version "2.1.18"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8"
+  integrity sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==
+  dependencies:
+    mime-db "~1.33.0"
+
 mime-types@^2.1.12, mime-types@^2.1.16, mime-types@^2.1.27, mime-types@^2.1.30, mime-types@^2.1.31, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24, mime-types@~2.1.34:
   version "2.1.35"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
@@ -14535,11 +17845,21 @@ mime-types@^2.1.12, mime-types@^2.1.16, mime-types@^2.1.27, mime-types@^2.1.30,
   dependencies:
     mime-db "1.52.0"
 
-mime@1.6.0, mime@^1.3.4:
+mime@1.6.0, mime@^1.3.4, mime@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
   integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
 
+mime@2.6.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367"
+  integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==
+
+mime@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-3.0.0.tgz#b374550dca3a0c18443b0c950a6a58f1931cf7a7"
+  integrity sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==
+
 mimic-fn@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
@@ -14589,7 +17909,7 @@ minimalistic-crypto-utils@^1.0.1:
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
   integrity sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==
 
-"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
+"minimatch@2 || 3", minimatch@3.1.2, minimatch@^3.0.0, minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
   integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
@@ -14617,6 +17937,13 @@ minimatch@^5.0.1:
   dependencies:
     brace-expansion "^2.0.1"
 
+minimatch@^5.1.0:
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96"
+  integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==
+  dependencies:
+    brace-expansion "^2.0.1"
+
 minimist-options@4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619"
@@ -14639,6 +17966,11 @@ minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18"
   integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==
 
+minimist@^1.2.7:
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
+  integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
+
 minipass@^2.6.0, minipass@^2.9.0:
   version "2.9.0"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6"
@@ -14681,17 +18013,27 @@ mkdirp@*:
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-3.0.0.tgz#758101231418bda24435c0888a91d9bd91f1372d"
   integrity sha512-7+JDnNsyCvZXoUJdkMR0oUE2AmAdsNXGTmRbiOjYIwQ6q+bL6NwrozGQdPcmYaNcrhH37F50HHBUzoaBV6FITQ==
 
-"mkdirp@>=0.5 0", mkdirp@^0.5.1, mkdirp@^0.5.5, mkdirp@~0.5.1:
+mkdirp@1.0.4, mkdirp@^1.0.3, mkdirp@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
+  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
+
+"mkdirp@>=0.5 0", mkdirp@^0.5.1, mkdirp@^0.5.5, mkdirp@^0.5.6, mkdirp@~0.5.1:
   version "0.5.6"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6"
   integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==
   dependencies:
     minimist "^1.2.6"
 
-mkdirp@^1.0.3, mkdirp@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
-  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
+mlly@^1.2.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/mlly/-/mlly-1.3.0.tgz#3184cb80c6437bda861a9f452ae74e3434ed9cd1"
+  integrity sha512-HT5mcgIQKkOrZecOjOX3DJorTikWXwsBfpcr/MGBkhfWcjiqvnaL/9ppxvIUXfjT6xt4DVIAsN9fMUz1ev4bIw==
+  dependencies:
+    acorn "^8.8.2"
+    pathe "^1.1.0"
+    pkg-types "^1.0.3"
+    ufo "^1.1.2"
 
 mnemonist@^0.38.3:
   version "0.38.5"
@@ -14948,7 +18290,7 @@ mute-stream@0.0.8:
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
   integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
 
-mv@~2:
+mv@2.1.1, mv@~2:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/mv/-/mv-2.1.1.tgz#ae6ce0d6f6d5e0a4f7d893798d03c1ea9559b6a2"
   integrity sha512-at/ZndSy3xEGJ8i0ygALh8ru9qy7gWW1cmkaqBN29JmMlIvM//MEO9y1sk/avxuwnPcfhkejkLsuPxH81BrkSg==
@@ -14967,6 +18309,11 @@ nano-json-stream-parser@^0.1.2:
   resolved "https://registry.yarnpkg.com/nano-json-stream-parser/-/nano-json-stream-parser-0.1.2.tgz#0cc8f6d0e2b622b479c40d499c46d64b755c6f5f"
   integrity sha512-9MqxMH/BSJC7dnLsEMPyfN5Dvoo49IsPFYMcHw3Bcfc2kN0lpHRBSzlMSVx4HGyJ7s9B31CyBTVehWJoQ8Ctew==
 
+nanoclone@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/nanoclone/-/nanoclone-0.2.1.tgz#dd4090f8f1a110d26bb32c49ed2f5b9235209ed4"
+  integrity sha512-wynEP02LmIbLpcYw8uBKpcfF6dmg2vcpKqxeH5UcoKEYdExslsdUA4ugFauuaeYdTB76ez6gJW8XAZ6CgkXYxA==
+
 nanoid@3.3.3:
   version "3.3.3"
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.3.tgz#fd8e8b7aa761fe807dba2d1b98fb7241bb724a25"
@@ -14977,6 +18324,11 @@ nanoid@^3.0.2, nanoid@^3.1.12, nanoid@^3.1.20, nanoid@^3.1.3, nanoid@^3.3.1, nan
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab"
   integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==
 
+nanoid@^3.3.6:
+  version "3.3.6"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.6.tgz#443380c856d6e9f9824267d960b4236ad583ea4c"
+  integrity sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==
+
 native-abort-controller@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/native-abort-controller/-/native-abort-controller-1.0.4.tgz#39920155cc0c18209ff93af5bc90be856143f251"
@@ -15027,7 +18379,7 @@ negotiator@0.6.3:
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
   integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
 
-neo-async@^2.6.2:
+neo-async@^2.6.0, neo-async@^2.6.2:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
   integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
@@ -15074,7 +18426,7 @@ node-fetch@2, node-fetch@^2.6.0, node-fetch@^2.6.1, node-fetch@^2.6.6, node-fetc
   dependencies:
     whatwg-url "^5.0.0"
 
-node-fetch@2.6.7:
+node-fetch@2.6.7, node-fetch@cjs:
   version "2.6.7"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
   integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
@@ -15120,6 +18472,11 @@ node-machine-id@^1.1.12:
   resolved "https://registry.yarnpkg.com/node-machine-id/-/node-machine-id-1.1.12.tgz#37904eee1e59b320bb9c5d6c0a59f3b469cb6267"
   integrity sha512-QNABxbrPa3qEIfrE6GOJ7BYIuignnJw7iQ2YPbc3Nla1HzRJjXzZOiikfF8m7eAMfichLt3M4VgLOetqgDmgGQ==
 
+node-releases@^2.0.12:
+  version "2.0.12"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.12.tgz#35627cc224a23bfb06fb3380f2b3afaaa7eb1039"
+  integrity sha512-QzsYKWhXTWx8h1kIvqfnC++o0pEmpRQA/aenALsL2F4pqNVr7YzcdMlDij5WBnwftRbJCNJL/O7zdKaxKPHqgQ==
+
 node-releases@^2.0.6:
   version "2.0.8"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.8.tgz#0f349cdc8fcfa39a92ac0be9bc48b7706292b9ae"
@@ -15234,6 +18591,11 @@ nwsapi@^2.2.0:
   resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.2.tgz#e5418863e7905df67d51ec95938d67bf801f0bb0"
   integrity sha512-90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw==
 
+nwsapi@^2.2.2:
+  version "2.2.5"
+  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.5.tgz#a52744c61b3889dd44b0a158687add39b8d935e2"
+  integrity sha512-6xpotnECFy/og7tKSBVmUNft7J3jyXAka4XvG6AUhFWRz+Q/Ljus7znJAA3bxColfQLdS+XsjoodtJfCgeTEFQ==
+
 nx-cloud@16.0.5, nx-cloud@latest:
   version "16.0.5"
   resolved "https://registry.yarnpkg.com/nx-cloud/-/nx-cloud-16.0.5.tgz#fa0b0185d254405ec47fcbcdbbd8b12ff1add096"
@@ -15473,7 +18835,7 @@ open@~8.4.0:
     is-docker "^2.1.1"
     is-wsl "^2.2.0"
 
-opener@^1.5.2:
+opener@^1.5.1, opener@^1.5.2:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.2.tgz#5d37e1f35077b9dcac4301372271afdeb2a13598"
   integrity sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==
@@ -15598,13 +18960,20 @@ p-limit@^2.0.0, p-limit@^2.2.0:
   dependencies:
     p-try "^2.0.0"
 
-p-limit@^3.0.2:
+p-limit@^3.0.2, p-limit@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
   integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
   dependencies:
     yocto-queue "^0.1.0"
 
+p-limit@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-4.0.0.tgz#914af6544ed32bfa54670b061cafcbd04984b644"
+  integrity sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==
+  dependencies:
+    yocto-queue "^1.0.0"
+
 p-locate@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
@@ -15790,6 +19159,13 @@ parse5@6.0.1:
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b"
   integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==
 
+parse5@^7.0.0, parse5@^7.1.1:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.1.2.tgz#0736bebbfd77793823240a23b7fc5e010b7f8e32"
+  integrity sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==
+  dependencies:
+    entities "^4.4.0"
+
 parseqs@0.0.5:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.5.tgz#d5208a3738e46766e291ba2ea173684921a8b89d"
@@ -15837,6 +19213,11 @@ patch-package@^6.5.1:
     tmp "^0.0.33"
     yaml "^1.10.2"
 
+path-browserify@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-1.0.1.tgz#d98454a9c3753d5790860f16f68867b9e46be1fd"
+  integrity sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==
+
 path-exists@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
@@ -15852,6 +19233,11 @@ path-is-absolute@^1.0.0:
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
   integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
 
+path-is-inside@1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
+  integrity sha512-DUWJr3+ULp4zXmol/SZkFf3JGsS9/SIv+Y3Rt93/UjPpDpklB5f1er4O3POIbUuUJ3FXgqte2Q7SrU6zAqwk8w==
+
 path-key@^2.0.0, path-key@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
@@ -15862,7 +19248,7 @@ path-key@^3.0.0, path-key@^3.1.0:
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
   integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
 
-path-parse@^1.0.7:
+path-parse@^1.0.6, path-parse@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
   integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
@@ -15872,6 +19258,11 @@ path-to-regexp@0.1.7:
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
   integrity sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==
 
+path-to-regexp@2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-2.2.1.tgz#90b617025a16381a879bc82a38d4e8bdeb2bcf45"
+  integrity sha512-gu9bD6Ta5bwGrrU8muHzVOBFFREpp2iRkVfhBJahwJ6p6Xw20SjT0MxLnwkjOibQmGSYhiUnf2FLe7k+jcFmGQ==
+
 path-type@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
@@ -15884,11 +19275,23 @@ path-type@^4.0.0:
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
   integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
 
+pathe@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/pathe/-/pathe-1.1.1.tgz#1dd31d382b974ba69809adc9a7a347e65d84829a"
+  integrity sha512-d+RQGp0MAYTIaDBIMmOfMwz3E+LOZnxx1HZd5R18mmCZY0QBlK0LDZfPc8FW8Ed2DlvsuE6PRjroDY+wg4+j/Q==
+
 pathval@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/pathval/-/pathval-1.1.1.tgz#8534e77a77ce7ac5a2512ea21e0fdb8fcf6c3d8d"
   integrity sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==
 
+pause-stream@0.0.11:
+  version "0.0.11"
+  resolved "https://registry.yarnpkg.com/pause-stream/-/pause-stream-0.0.11.tgz#fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445"
+  integrity sha512-e3FBlXLmN/D1S+zHzanP4E/4Z60oFAa3O051qt1pxa7DEJWKAyil6upYVXCWadEnuoqa4Pkc9oUx9zsxYeRv8A==
+  dependencies:
+    through "~2.3"
+
 pbkdf2@^3.0.17, pbkdf2@^3.0.3:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.2.tgz#dd822aa0887580e52f1a039dc3eda108efae3075"
@@ -15955,6 +19358,14 @@ pify@^5.0.0:
   resolved "https://registry.yarnpkg.com/pify/-/pify-5.0.0.tgz#1f5eca3f5e87ebec28cc6d54a0e4aaf00acc127f"
   integrity sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA==
 
+pino-abstract-transport@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/pino-abstract-transport/-/pino-abstract-transport-1.0.0.tgz#cc0d6955fffcadb91b7b49ef220a6cc111d48bb3"
+  integrity sha512-c7vo5OpW4wIS42hUVcT5REsL8ZljsUfBjqV/e2sFxmFEFZiq1XLUp5EYLtuDH6PEHq9W1egWqRbnLUP5FuZmOA==
+  dependencies:
+    readable-stream "^4.0.0"
+    split2 "^4.0.0"
+
 pino-abstract-transport@v0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/pino-abstract-transport/-/pino-abstract-transport-0.5.0.tgz#4b54348d8f73713bfd14e3dc44228739aa13d9c0"
@@ -16004,6 +19415,15 @@ pkg-dir@^4.1.0, pkg-dir@^4.2.0:
   dependencies:
     find-up "^4.0.0"
 
+pkg-types@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/pkg-types/-/pkg-types-1.0.3.tgz#988b42ab19254c01614d13f4f65a2cfc7880f868"
+  integrity sha512-nN7pYi0AQqJnoLPC9eHFQ8AcyaixBUOwvqc5TDnIKCMEE6I0y8P7OKA7fPexsXGCGxQDl/cmrLAp26LhcwxZ4A==
+  dependencies:
+    jsonc-parser "^3.2.0"
+    mlly "^1.2.0"
+    pathe "^1.1.0"
+
 pkg-up@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-3.1.0.tgz#100ec235cc150e4fd42519412596a28512a0def5"
@@ -16011,6 +19431,11 @@ pkg-up@^3.1.0:
   dependencies:
     find-up "^3.0.0"
 
+pkginfo@0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/pkginfo/-/pkginfo-0.4.1.tgz#b5418ef0439de5425fc4995042dced14fb2a84ff"
+  integrity sha512-8xCNE/aT/EXKenuMDZ+xTVwkT8gsoHN2z/Q29l80u0ppGEXVvsKRzNMbtKhg8LS8k1tJLAHHylf6p4VFmP6XUQ==
+
 plurals-cldr@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/plurals-cldr/-/plurals-cldr-1.0.4.tgz#534e4784f80679d3b0b39b0fb6cc46645fcf5de8"
@@ -16043,6 +19468,15 @@ popper-max-size-modifier@^0.2.0:
   resolved "https://registry.yarnpkg.com/popper-max-size-modifier/-/popper-max-size-modifier-0.2.0.tgz#1574744401296a488b4974909d130a85db94256f"
   integrity sha512-UerPt9pZfTFnpSpIBVJrR3ibHMuU1k5K01AyNLfMUWCr4z1MFH+dsayPlAF9ZeYExa02HPiQn5OIMqUSVtJEbg==
 
+portfinder@^1.0.28:
+  version "1.0.32"
+  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.32.tgz#2fe1b9e58389712429dc2bea5beb2146146c7f81"
+  integrity sha512-on2ZJVVDXRADWE6jnQaX0ioEylzgBpQk8r55NE4wjXW1ZxO+BgDlY6DXwj20i0V8eB4SenDQ00WEaxfiIQPcxg==
+  dependencies:
+    async "^2.6.4"
+    debug "^3.2.7"
+    mkdirp "^0.5.6"
+
 postcss-attribute-case-insensitive@^5.0.2:
   version "5.0.2"
   resolved "https://registry.yarnpkg.com/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-5.0.2.tgz#03d761b24afc04c09e757e92ff53716ae8ea2741"
@@ -16595,6 +20029,15 @@ postcss@^8.3.5, postcss@^8.4.18, postcss@^8.4.19, postcss@^8.4.4:
     picocolors "^1.0.0"
     source-map-js "^1.0.2"
 
+postcss@^8.4.23:
+  version "8.4.24"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.24.tgz#f714dba9b2284be3cc07dbd2fc57ee4dc972d2df"
+  integrity sha512-M0RzbcI0sO/XJNucsGjvWU9ERWxb/ytp1w6dKtxTKgixdtQDq4rmx/g8W1hnaheq9jgwL/oyEdH5Bc4WwJKMqg==
+  dependencies:
+    nanoid "^3.3.6"
+    picocolors "^1.0.0"
+    source-map-js "^1.0.2"
+
 preact@10.4.1:
   version "10.4.1"
   resolved "https://registry.yarnpkg.com/preact/-/preact-10.4.1.tgz#9b3ba020547673a231c6cf16f0fbaef0e8863431"
@@ -16625,6 +20068,11 @@ prettier@^2.3.1:
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.3.tgz#ab697b1d3dd46fb4626fbe2f543afe0cc98d8632"
   integrity sha512-tJ/oJ4amDihPoufT5sM0Z1SKEuKay8LfVAMlbbhnnkvt6BUserZylqo2PN+p9KeljLr0OHa2rXHU1T8reeoTrw==
 
+prettier@^2.6.2:
+  version "2.8.8"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da"
+  integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==
+
 pretty-bytes@^5.3.0, pretty-bytes@^5.4.1, pretty-bytes@^5.6.0:
   version "5.6.0"
   resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.6.0.tgz#356256f643804773c82f64723fe78c92c62beaeb"
@@ -16648,7 +20096,7 @@ pretty-format@^26.6.2:
     ansi-styles "^4.0.0"
     react-is "^17.0.1"
 
-pretty-format@^27.0.0, pretty-format@^27.0.2, pretty-format@^27.5.1:
+pretty-format@^27.0.2, pretty-format@^27.5.1:
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.5.1.tgz#2181879fdea51a7a5851fb39d920faa63f01d88e"
   integrity sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==
@@ -16676,12 +20124,21 @@ pretty-format@^29.0.0, pretty-format@^29.3.1:
     ansi-styles "^5.0.0"
     react-is "^18.0.0"
 
+pretty-format@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.5.0.tgz#283134e74f70e2e3e7229336de0e4fce94ccde5a"
+  integrity sha512-V2mGkI31qdttvTFX7Mt4efOqHXqJWMu4/r66Xh3Z3BwZaPfPJgp6/gbwoujRpPUtfEF6AUUWx3Jim3GCw5g/Qw==
+  dependencies:
+    "@jest/schemas" "^29.4.3"
+    ansi-styles "^5.0.0"
+    react-is "^18.0.0"
+
 process-nextick-args@~2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
   integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
 
-process-warning@^1.0.0:
+process-warning@1.0.0, process-warning@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/process-warning/-/process-warning-1.0.0.tgz#980a0b25dc38cd6034181be4b7726d89066b4616"
   integrity sha512-du4wfLyj4yCZq1VupnVSZmRsPJsNuxoDQFdCFHLaYiEbFBD7QE0a+I4D7hOxrVnh78QE/YipFAj9lXHiXocV+Q==
@@ -16730,6 +20187,11 @@ prop-types@^15.5.10, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1:
     object-assign "^4.1.1"
     react-is "^16.13.1"
 
+property-expr@^2.0.4:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/property-expr/-/property-expr-2.0.5.tgz#278bdb15308ae16af3e3b9640024524f4dc02cb4"
+  integrity sha512-IJUkICM5dP5znhCckHSv30Q4b5/JA5enCtkRHYaOVOAocnH/1BQEYTC5NMfT3AVl/iXKdr3aqQbQn9DxyWknwA==
+
 protobufjs@^6.10.2:
   version "6.11.3"
   resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.11.3.tgz#637a527205a35caa4f3e2a9a4a13ddffe0e7af74"
@@ -16782,6 +20244,13 @@ proxy-from-env@^1.1.0:
   resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
   integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
 
+ps-tree@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/ps-tree/-/ps-tree-1.2.0.tgz#5e7425b89508736cdd4f2224d028f7bb3f722ebd"
+  integrity sha512-0VnamPPYHl4uaU/nSFeZZpR21QAWRz+sRv4iW9+v/GS/J5U5iZB5BNN6J0RMoOvdx2gWM2+ZFMIm58q24e4UYA==
+  dependencies:
+    event-stream "=3.3.4"
+
 pseudolocale@^1.1.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/pseudolocale/-/pseudolocale-1.2.0.tgz#787021d9a11abfdd8f084eabe0e59845ba571453"
@@ -16836,6 +20305,11 @@ punycode@2.1.0:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.0.tgz#5f863edc89b96db09074bad7947bf09056ca4e7d"
   integrity sha512-Yxz2kRwT90aPiWEMHVYnEf4+rhwF1tBmmZ4KepCP+Wkium9JxtWnUm1nqGwpiAHr/tnTSeHqr3wb++jgSkXjhA==
 
+punycode@^1.3.2:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
+  integrity sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==
+
 punycode@^2.1.0, punycode@^2.1.1:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.2.0.tgz#2092cc57cd2582c38e4e7e8bb869dc8d3148bc74"
@@ -16848,6 +20322,11 @@ pupa@^2.0.1:
   dependencies:
     escape-goat "^2.0.0"
 
+pure-rand@^6.0.0:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/pure-rand/-/pure-rand-6.0.2.tgz#a9c2ddcae9b68d736a8163036f088a2781c8b306"
+  integrity sha512-6Yg0ekpKICSjPswYOuC5sku/TSWaRYlA0qsXqJgM/d/4pLPHPuTxK7Nbf7jFKzAeedUhR8C7K9Uv63FBsSo8xQ==
+
 q@^1.1.2, q@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
@@ -16873,6 +20352,13 @@ qs@6.11.0, qs@^6.10.3, qs@^6.5.1, qs@^6.9.1:
   dependencies:
     side-channel "^1.0.4"
 
+qs@^6.4.0:
+  version "6.11.2"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.2.tgz#64bea51f12c1f5da1bc01496f48ffcff7c69d7d9"
+  integrity sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==
+  dependencies:
+    side-channel "^1.0.4"
+
 qs@~6.10.3:
   version "6.10.5"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.5.tgz#974715920a80ff6a262264acd2c7e6c2a53282b4"
@@ -16992,6 +20478,11 @@ randomfill@^1.0.3:
     randombytes "^2.0.5"
     safe-buffer "^5.1.0"
 
+range-parser@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
+  integrity sha512-kA5WQoNVo4t9lNx2kQNFCxKeBl5IbbSNBl1M/tLkw9WCn+hxNBAW5Qh8gdhs63CJnhjJ2zQWFoqPJP2sK1AV5A==
+
 range-parser@^1.2.1, range-parser@~1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
@@ -17017,7 +20508,7 @@ raw-body@2.5.2:
     iconv-lite "0.4.24"
     unpipe "1.0.0"
 
-rc@1.2.8, rc@^1.2.8:
+rc@1.2.8, rc@^1.0.1, rc@^1.1.6, rc@^1.2.8:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
   integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
@@ -17304,6 +20795,11 @@ react-refresh@^0.11.0:
   resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.11.0.tgz#77198b944733f0f1f1a90e791de4541f9f074046"
   integrity sha512-F27qZr8uUqwhWZboondsPx8tnC3Ct3SxZA3V5WyEvujRyyNv0VYPhoBg1gZ8/MV5tubQp76Trw8lTv9hzRBa+A==
 
+react-refresh@^0.14.0:
+  version "0.14.0"
+  resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.14.0.tgz#4e02825378a5f227079554d4284889354e5f553e"
+  integrity sha512-wViHqhAd8OHeLS/IRMJjTSDHF3U9eWi62F/MledQGPdJGDhodXJ9PBLNGr6WWL7qlH12Mt3TyTpbS+hGXMjCzQ==
+
 react-remove-scroll-bar@^2.1.0:
   version "2.3.4"
   resolved "https://registry.yarnpkg.com/react-remove-scroll-bar/-/react-remove-scroll-bar-2.3.4.tgz#53e272d7a5cb8242990c7f144c44d8bd8ab5afd9"
@@ -17518,6 +21014,16 @@ readable-stream@^3.0.2, readable-stream@^3.0.6, readable-stream@^3.1.1, readable
     string_decoder "^1.1.1"
     util-deprecate "^1.0.1"
 
+readable-stream@^4.0.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-4.4.0.tgz#55ce132d60a988c460d75c631e9ccf6a7229b468"
+  integrity sha512-kDMOq0qLtxV9f/SQv522h8cxZBqNZXuXNyjyezmfAAuribMyVXziljpQ/uQhfE1XLg2/TLTW2DsnoE4VAi/krg==
+  dependencies:
+    abort-controller "^3.0.0"
+    buffer "^6.0.3"
+    events "^3.3.0"
+    process "^0.11.10"
+
 readable-stream@~1.1.9:
   version "1.1.14"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
@@ -17684,6 +21190,26 @@ regexpu-core@^5.2.1:
     unicode-match-property-ecmascript "^2.0.0"
     unicode-match-property-value-ecmascript "^2.1.0"
 
+regexpu-core@^5.3.1:
+  version "5.3.2"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.3.2.tgz#11a2b06884f3527aec3e93dbbf4a3b958a95546b"
+  integrity sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==
+  dependencies:
+    "@babel/regjsgen" "^0.8.0"
+    regenerate "^1.4.2"
+    regenerate-unicode-properties "^10.1.0"
+    regjsparser "^0.9.1"
+    unicode-match-property-ecmascript "^2.0.0"
+    unicode-match-property-value-ecmascript "^2.1.0"
+
+registry-auth-token@3.3.2:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.3.2.tgz#851fd49038eecb586911115af845260eec983f20"
+  integrity sha512-JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ==
+  dependencies:
+    rc "^1.1.6"
+    safe-buffer "^5.0.1"
+
 registry-auth-token@^4.0.0:
   version "4.2.2"
   resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.2.tgz#f02d49c3668884612ca031419491a13539e21fac"
@@ -17691,6 +21217,13 @@ registry-auth-token@^4.0.0:
   dependencies:
     rc "1.2.8"
 
+registry-url@3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-3.1.0.tgz#3d4ef870f73dde1d77f0cf9a381432444e174942"
+  integrity sha512-ZbgR5aZEdf4UKZVBPYIgaglBmSF2Hi94s2PcIHhRGFjKYu+chjJdYfHn4rt3hB6eCKLJ8giVIIfgMa1ehDfZKA==
+  dependencies:
+    rc "^1.0.1"
+
 registry-url@^5.0.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-5.1.0.tgz#e98334b50d5434b81136b44ec638d9c2009c5009"
@@ -17747,7 +21280,7 @@ request-progress@^3.0.0:
   dependencies:
     throttleit "^1.0.0"
 
-request@^2.79.0:
+request@2.88.2, request@^2.79.0:
   version "2.88.2"
   resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
   integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
@@ -17838,11 +21371,21 @@ resolve-url-loader@^4.0.0:
     postcss "^7.0.35"
     source-map "0.6.1"
 
+resolve.exports@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.0.tgz#5ce842b94b05146c0e03076985d1d0e7e48c90c9"
+  integrity sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==
+
 resolve.exports@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.1.tgz#05cfd5b3edf641571fd46fa608b610dda9ead999"
   integrity sha512-/NtpHNDN7jWhAaQ9BvBUYZ6YTXsRBgfqWFWP7BZBaoMJO/I3G5OFzvTuWNlZC3aPjins1F+TNrLKsGbH4rfsRQ==
 
+resolve.exports@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-2.0.2.tgz#f8c934b8e6a13f539e38b7098e2e36134f01e800"
+  integrity sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==
+
 resolve@^1.1.7, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.22.1:
   version "1.22.1"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177"
@@ -17861,6 +21404,23 @@ resolve@^2.0.0-next.4:
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
+resolve@~1.19.0:
+  version "1.19.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz#1af5bf630409734a067cae29318aac7fa29a267c"
+  integrity sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==
+  dependencies:
+    is-core-module "^2.1.0"
+    path-parse "^1.0.6"
+
+resolve@~1.22.1:
+  version "1.22.2"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.2.tgz#0ed0943d4e301867955766c9f3e1ae6d01c6845f"
+  integrity sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==
+  dependencies:
+    is-core-module "^2.11.0"
+    path-parse "^1.0.7"
+    supports-preserve-symlinks-flag "^1.0.0"
+
 responselike@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7"
@@ -17954,13 +21514,20 @@ rollup-plugin-terser@^7.0.0:
     serialize-javascript "^4.0.0"
     terser "^5.0.0"
 
-rollup@^2.43.1:
+rollup@^2.43.1, rollup@^2.77.2:
   version "2.79.1"
   resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.79.1.tgz#bedee8faef7c9f93a2647ac0108748f497f081c7"
   integrity sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==
   optionalDependencies:
     fsevents "~2.3.2"
 
+rollup@^3.21.0:
+  version "3.25.1"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-3.25.1.tgz#9fff79d22ff1a904b2b595a2fb9bc3793cb987d8"
+  integrity sha512-tywOR+rwIt5m2ZAWSe5AIJcTat8vGlnPFAv15ycCrw33t6iFsXZ6mzHVFh2psSjxQPmI+xgzMZZizUAukBI4aQ==
+  optionalDependencies:
+    fsevents "~2.3.2"
+
 rpc-websockets@^7.5.0:
   version "7.5.0"
   resolved "https://registry.yarnpkg.com/rpc-websockets/-/rpc-websockets-7.5.0.tgz#bbeb87572e66703ff151e50af1658f98098e2748"
@@ -18005,6 +21572,13 @@ rxjs@^7.5.1:
   dependencies:
     tslib "^2.1.0"
 
+rxjs@^7.8.0:
+  version "7.8.1"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.1.tgz#6f6f3d99ea8044291efd92e7c7fcf562c4057543"
+  integrity sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==
+  dependencies:
+    tslib "^2.1.0"
+
 safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
@@ -18076,6 +21650,13 @@ saxes@^5.0.1:
   dependencies:
     xmlchars "^2.2.0"
 
+saxes@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/saxes/-/saxes-6.0.0.tgz#fe5b4a4768df4f14a201b1ba6a65c1f3d9988cc5"
+  integrity sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==
+  dependencies:
+    xmlchars "^2.2.0"
+
 scheduler@^0.23.0:
   version "0.23.0"
   resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.23.0.tgz#ba8041afc3d30eb206a487b6b384002e4e61fdfe"
@@ -18134,6 +21715,11 @@ secp256k1@^4.0.1:
     node-addon-api "^2.0.0"
     node-gyp-build "^4.2.0"
 
+secure-compare@3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/secure-compare/-/secure-compare-3.0.1.tgz#f1a0329b308b221fae37b9974f3d578d0ca999e3"
+  integrity sha512-AckIIV90rPDcBcglUwXPF3kg0P0qmPsPXAj6BBEENQE1p5yA1xfmDJzfi1Tappj37Pv2mVbKpL3Z1T+Nn7k1Qw==
+
 select-hose@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
@@ -18165,13 +21751,34 @@ semver@7.3.4:
   dependencies:
     lru-cache "^6.0.0"
 
-semver@7.3.8, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8:
+semver@7.3.8, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@~7.3.0:
   version "7.3.8"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798"
   integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==
   dependencies:
     lru-cache "^6.0.0"
 
+semver@7.5.0:
+  version "7.5.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.0.tgz#ed8c5dc8efb6c629c88b23d41dc9bf40c1d96cd0"
+  integrity sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==
+  dependencies:
+    lru-cache "^6.0.0"
+
+semver@7.5.1:
+  version "7.5.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.1.tgz#c90c4d631cf74720e46b21c1d37ea07edfab91ec"
+  integrity sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==
+  dependencies:
+    lru-cache "^6.0.0"
+
+semver@7.x:
+  version "7.5.2"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.2.tgz#5b851e66d1be07c1cdaf37dfc856f543325a2beb"
+  integrity sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==
+  dependencies:
+    lru-cache "^6.0.0"
+
 semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
@@ -18217,6 +21824,20 @@ serialize-javascript@^6.0.0:
   dependencies:
     randombytes "^2.1.0"
 
+serve-handler@6.1.5:
+  version "6.1.5"
+  resolved "https://registry.yarnpkg.com/serve-handler/-/serve-handler-6.1.5.tgz#a4a0964f5c55c7e37a02a633232b6f0d6f068375"
+  integrity sha512-ijPFle6Hwe8zfmBxJdE+5fta53fdIY0lHISJvuikXB3VYFafRjMRpOffSPvCYsbKyBA7pvy9oYr/BT1O3EArlg==
+  dependencies:
+    bytes "3.0.0"
+    content-disposition "0.5.2"
+    fast-url-parser "1.1.3"
+    mime-types "2.1.18"
+    minimatch "3.1.2"
+    path-is-inside "1.0.2"
+    path-to-regexp "2.2.1"
+    range-parser "1.2.0"
+
 serve-index@^1.9.1:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239"
@@ -18240,6 +21861,23 @@ serve-static@1.15.0:
     parseurl "~1.3.3"
     send "0.18.0"
 
+serve@^14.2.0:
+  version "14.2.0"
+  resolved "https://registry.yarnpkg.com/serve/-/serve-14.2.0.tgz#3d768e88fa13ad8644f2393599189707176e66b8"
+  integrity sha512-+HOw/XK1bW8tw5iBilBz/mJLWRzM8XM6MPxL4J/dKzdxq1vfdEWSwhaR7/yS8EJp5wzvP92p1qirysJvnEtjXg==
+  dependencies:
+    "@zeit/schemas" "2.29.0"
+    ajv "8.11.0"
+    arg "5.0.2"
+    boxen "7.0.0"
+    chalk "5.0.1"
+    chalk-template "0.4.0"
+    clipboardy "3.0.0"
+    compression "1.7.4"
+    is-port-reachable "4.0.0"
+    serve-handler "6.1.5"
+    update-check "1.5.4"
+
 servify@^0.1.12:
   version "0.1.12"
   resolved "https://registry.yarnpkg.com/servify/-/servify-0.1.12.tgz#142ab7bee1f1d033b66d0707086085b17c06db95"
@@ -18329,7 +21967,12 @@ side-channel@^1.0.4:
     get-intrinsic "^1.0.2"
     object-inspect "^1.9.0"
 
-signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3:
+siginfo@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/siginfo/-/siginfo-2.0.0.tgz#32e76c70b79724e3bb567cb9d543eb858ccfaf30"
+  integrity sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==
+
+signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7:
   version "3.0.7"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
   integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
@@ -18376,6 +22019,15 @@ sirv@^1.0.7:
     mrmime "^1.0.0"
     totalist "^1.0.0"
 
+sirv@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/sirv/-/sirv-2.0.3.tgz#ca5868b87205a74bef62a469ed0296abceccd446"
+  integrity sha512-O9jm9BsID1P+0HOi81VpXPoDxYP374pkOLzACAoyUQ/3OUVndNpsz6wMnY2z+yOxzbllCKZrM+9QrWsv4THnyA==
+  dependencies:
+    "@polka/url" "^1.0.0-next.20"
+    mrmime "^1.0.0"
+    totalist "^3.0.0"
+
 sisteransi@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed"
@@ -18414,6 +22066,14 @@ slice-ansi@^4.0.0:
     astral-regex "^2.0.0"
     is-fullwidth-code-point "^3.0.0"
 
+snake-case@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/snake-case/-/snake-case-3.0.4.tgz#4f2bbd568e9935abdfd593f34c691dadb49c452c"
+  integrity sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==
+  dependencies:
+    dot-case "^3.0.4"
+    tslib "^2.0.3"
+
 socket.io-adapter@~1.1.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.2.tgz#ab3f0d6f66b8fc7fca3959ab5991f82221789be9"
@@ -18469,6 +22129,13 @@ sockjs@^0.3.24:
     uuid "^8.3.2"
     websocket-driver "^0.7.4"
 
+sonic-boom@3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/sonic-boom/-/sonic-boom-3.3.0.tgz#cffab6dafee3b2bcb88d08d589394198bee1838c"
+  integrity sha512-LYxp34KlZ1a2Jb8ZQgFCK3niIHzibdwtwNUWKg0qQRzsDoJ3Gfgkf8KdBTFU3SkejDEIlWwnSnpVdOZIhFMl/g==
+  dependencies:
+    atomic-sleep "^1.0.0"
+
 sonic-boom@^2.2.1:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/sonic-boom/-/sonic-boom-2.8.0.tgz#c1def62a77425090e6ad7516aad8eb402e047611"
@@ -18495,6 +22162,22 @@ source-map-loader@^3.0.0:
     iconv-lite "^0.6.3"
     source-map-js "^1.0.1"
 
+source-map-support@0.5.13:
+  version "0.5.13"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz#31b24a9c2e73c2de85066c0feb7d44767ed52932"
+  integrity sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==
+  dependencies:
+    buffer-from "^1.0.0"
+    source-map "^0.6.0"
+
+source-map-support@0.5.19:
+  version "0.5.19"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
+  integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==
+  dependencies:
+    buffer-from "^1.0.0"
+    source-map "^0.6.0"
+
 source-map-support@^0.5.6, source-map-support@~0.5.20:
   version "0.5.21"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"
@@ -18608,6 +22291,13 @@ split2@^4.0.0:
   resolved "https://registry.yarnpkg.com/split2/-/split2-4.2.0.tgz#c9c5920904d148bab0b9f67145f245a86aadbfa4"
   integrity sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==
 
+split@0.3:
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/split/-/split-0.3.3.tgz#cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f"
+  integrity sha512-wD2AeVmxXRBoX44wAycgjVpMhvbwdI2aZjCkvfNcH1YqHQvJVa1duWc73OyVGJUc05fhFaTZeQ/PYsrmyH0JVA==
+  dependencies:
+    through "2"
+
 sprintf-js@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
@@ -18640,11 +22330,30 @@ stack-utils@^2.0.3:
   dependencies:
     escape-string-regexp "^2.0.0"
 
+stackback@0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/stackback/-/stackback-0.0.2.tgz#1ac8a0d9483848d1695e418b6d031a3c3ce68e3b"
+  integrity sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==
+
 stackframe@^1.3.4:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.3.4.tgz#b881a004c8c149a5e8efef37d51b16e412943310"
   integrity sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw==
 
+start-server-and-test@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/start-server-and-test/-/start-server-and-test-2.0.0.tgz#0644809d63036a8a001efb70582f3e37ebfdd33d"
+  integrity sha512-UqKLw0mJbfrsG1jcRLTUlvuRi9sjNuUiDOLI42r7R5fA9dsFoywAy9DoLXNYys9B886E4RCKb+qM1Gzu96h7DQ==
+  dependencies:
+    arg "^5.0.2"
+    bluebird "3.7.2"
+    check-more-types "2.24.0"
+    debug "4.3.4"
+    execa "5.1.1"
+    lazy-ass "1.6.0"
+    ps-tree "1.2.0"
+    wait-on "7.0.1"
+
 stats-lite@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/stats-lite/-/stats-lite-2.2.0.tgz#278a5571fa1d2e8b1691295dccc0235282393bbf"
@@ -18662,6 +22371,18 @@ statuses@2.0.1:
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
   integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==
 
+std-env@^3.3.2:
+  version "3.3.3"
+  resolved "https://registry.yarnpkg.com/std-env/-/std-env-3.3.3.tgz#a54f06eb245fdcfef53d56f3c0251f1d5c3d01fe"
+  integrity sha512-Rz6yejtVyWnVjC1RFvNmYL10kgjC49EOghxWn0RFqlCHGFpQx+Xe7yW3I4ceK1SGrWIGMjD5Kbue8W/udkbMJg==
+
+steno@^0.4.1:
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/steno/-/steno-0.4.4.tgz#071105bdfc286e6615c0403c27e9d7b5dcb855cb"
+  integrity sha512-EEHMVYHNXFHfGtgjNITnka0aHhiAlo93F7z2/Pwd+g0teG9CnM3JIINM7hVVB5/rhw9voufD7Wukwgtw2uqh6w==
+  dependencies:
+    graceful-fs "^4.1.3"
+
 stop-iteration-iterator@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz#6a60be0b4ee757d1ed5254858ec66b10c49285e4"
@@ -18682,6 +22403,13 @@ stream-browserify@^3.0.0:
     inherits "~2.0.4"
     readable-stream "^3.5.0"
 
+stream-combiner@~0.0.4:
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/stream-combiner/-/stream-combiner-0.0.4.tgz#4d5e433c185261dde623ca3f44c586bcf5c4ad14"
+  integrity sha512-rT00SPnTVyRsaSz5zgSPma/aHSOic5U1prhYdRy5HS2kTZviFpmDgzilbtsJsxiroqACmayynDN/9VzIbX5DOw==
+  dependencies:
+    duplexer "~0.1.1"
+
 stream-http@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-3.2.0.tgz#1872dfcf24cb15752677e40e5c3f9cc1926028b5"
@@ -18721,6 +22449,11 @@ strict-uri-encode@^2.0.0:
   resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz#b9c7330c7042862f6b142dc274bbcc5866ce3546"
   integrity sha512-QwiXZgpRcKkhTj2Scnn++4PKtWsH0kpzZ62L2R6c/LUVYv7hVnZqcg2+sMuT6R7Jusu1vviK/MFsu6kNJfWlEQ==
 
+string-argv@~0.3.1:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.2.tgz#2b6d0ef24b656274d957d54e0a4bbf6153dc02b6"
+  integrity sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q==
+
 string-format@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/string-format/-/string-format-2.0.0.tgz#f2df2e7097440d3b65de31b6d40d54c96eaffb9b"
@@ -18782,6 +22515,15 @@ string-width@^3.0.0, string-width@^3.1.0:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^5.1.0"
 
+string-width@^5.0.1, string-width@^5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794"
+  integrity sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==
+  dependencies:
+    eastasianwidth "^0.2.0"
+    emoji-regex "^9.2.2"
+    strip-ansi "^7.0.1"
+
 string.prototype.matchall@^4.0.6, string.prototype.matchall@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.8.tgz#3bf85722021816dcd1bf38bb714915887ca79fd3"
@@ -18921,7 +22663,7 @@ strip-indent@^3.0.0:
   dependencies:
     min-indent "^1.0.0"
 
-strip-json-comments@3.1.1, strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
+strip-json-comments@3.1.1, strip-json-comments@^3.1.0, strip-json-comments@^3.1.1, strip-json-comments@~3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
@@ -18931,6 +22673,13 @@ strip-json-comments@~2.0.1:
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
   integrity sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==
 
+strip-literal@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/strip-literal/-/strip-literal-1.0.1.tgz#0115a332710c849b4e46497891fb8d585e404bd2"
+  integrity sha512-QZTsipNpa2Ppr6v1AmJHESqJ3Uz247MUS0OjrnnZjFAvEoWqxuyFuXn2xLgMtRnijJShAa1HL0gtJyUs7u7n3Q==
+  dependencies:
+    acorn "^8.8.2"
+
 strong-log-transformer@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/strong-log-transformer/-/strong-log-transformer-2.1.0.tgz#0f5ed78d325e0421ac6f90f7f10e691d6ae3ae10"
@@ -18968,6 +22717,13 @@ styled-components@^5.3.0:
     shallowequal "^1.1.0"
     supports-color "^5.5.0"
 
+styled-jsx@5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/styled-jsx/-/styled-jsx-5.1.2.tgz#55020c50da54d2b225750bd7aaab57d511724060"
+  integrity sha512-FI5r0a5ED2/+DSdG2ZRz3a4FtNQnKPLadauU5v76a9QsscwZrWggQKOmyxGGP5EWKbyY3bsuWAJYzyKaDAVAcw==
+  dependencies:
+    client-only "0.0.1"
+
 styled-system@^5.0.0, styled-system@^5.1.5:
   version "5.1.5"
   resolved "https://registry.yarnpkg.com/styled-system/-/styled-system-5.1.5.tgz#e362d73e1dbb5641a2fd749a6eba1263dc85075e"
@@ -19039,7 +22795,7 @@ supports-preserve-symlinks-flag@^1.0.0:
   resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
   integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
 
-svg-parser@^2.0.2:
+svg-parser@^2.0.2, svg-parser@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/svg-parser/-/svg-parser-2.0.4.tgz#fdc2e29e13951736140b76cb122c8ee6630eb6b5"
   integrity sha512-e4hG1hRwoOdRb37cIMSgzNsxyzKfayW6VOflrwvR+/bzrkyxY/31WkbgnQpgtrNp1SdpJvpUAGTa/ZoiPNDuRQ==
@@ -19076,6 +22832,18 @@ svgo@^2.7.0:
     picocolors "^1.0.0"
     stable "^0.1.8"
 
+svgo@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/svgo/-/svgo-3.0.2.tgz#5e99eeea42c68ee0dc46aa16da093838c262fe0a"
+  integrity sha512-Z706C1U2pb1+JGP48fbazf3KxHrWOsLme6Rv7imFBn5EnuanDW1GPaA/P1/dvObE670JDePC3mnj0k0B7P0jjQ==
+  dependencies:
+    "@trysound/sax" "0.2.0"
+    commander "^7.2.0"
+    css-select "^5.1.0"
+    css-tree "^2.2.1"
+    csso "^5.0.5"
+    picocolors "^1.0.0"
+
 swarm-js@^0.1.40:
   version "0.1.42"
   resolved "https://registry.yarnpkg.com/swarm-js/-/swarm-js-0.1.42.tgz#497995c62df6696f6e22372f457120e43e727979"
@@ -19341,7 +23109,7 @@ through2@~0.6.3:
     readable-stream ">=1.0.33-1 <1.1.0-0"
     xtend ">=4.0.0 <4.1.0-0"
 
-"through@>=2.2.7 <3", through@^2.3.4, through@^2.3.6, through@^2.3.8:
+through@2, "through@>=2.2.7 <3", through@^2.3.4, through@^2.3.6, through@^2.3.8, through@~2.3, through@~2.3.1:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
   integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==
@@ -19351,6 +23119,11 @@ thunky@^1.0.2:
   resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz#5abaf714a9405db0504732bbccd2cedd9ef9537d"
   integrity sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==
 
+time-zone@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/time-zone/-/time-zone-1.0.0.tgz#99c5bf55958966af6d06d83bdf3800dc82faec5d"
+  integrity sha512-TIsDdtKo6+XrPtiTm1ssmMngN1sAhyKnTO2kunQWqNPWIVvCm15Wmw4SWInwTVgJ5u/Tr04+8Ei9TNcw4x4ONA==
+
 timeago.js@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/timeago.js/-/timeago.js-4.0.2.tgz#724e8c8833e3490676c7bb0a75f5daf20e558028"
@@ -19384,11 +23157,26 @@ tiny-warning@^1.0.3:
   resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754"
   integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==
 
+tinybench@^2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/tinybench/-/tinybench-2.5.0.tgz#4711c99bbf6f3e986f67eb722fed9cddb3a68ba5"
+  integrity sha512-kRwSG8Zx4tjF9ZiyH4bhaebu+EDz1BOx9hOigYHlUW4xxI/wKIUQUqo018UlU4ar6ATPBsaMrdbKZ+tmPdohFA==
+
 tinycolor2@^1.4.1:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/tinycolor2/-/tinycolor2-1.5.2.tgz#7d30b4584d8b7d62b9a94dacc505614a6516a95f"
   integrity sha512-h80m9GPFGbcLzZByXlNSEhp1gf8Dy+VX/2JCGUZsWLo7lV1mnE/XlxGYgRBoMLJh1lIDXP0EMC4RPTjlRaV+Bg==
 
+tinypool@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/tinypool/-/tinypool-0.5.0.tgz#3861c3069bf71e4f1f5aa2d2e6b3aaacc278961e"
+  integrity sha512-paHQtnrlS1QZYKF/GnLoOM/DN9fqaGOFbCbxzAhwniySnzl9Ebk8w73/dd34DAhe/obUbPAOldTyYXQZxnPBPQ==
+
+tinyspy@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/tinyspy/-/tinyspy-2.1.1.tgz#9e6371b00c259e5c5b301917ca18c01d40ae558c"
+  integrity sha512-XPJL2uSzcOyBMky6OFrusqWlzfFrXtE0hPuMgW8A2HmaqrPo4ZQHRN/V0QXN3FSjKxpsbRrFc5LI7KOwBsT1/w==
+
 tmp@^0.0.33:
   version "0.0.33"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
@@ -19450,11 +23238,21 @@ toidentifier@1.0.1:
   resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35"
   integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==
 
+toposort@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/toposort/-/toposort-2.0.2.tgz#ae21768175d1559d48bef35420b2f4962f09c330"
+  integrity sha512-0a5EOkAUp8D4moMi2W8ZF8jcga7BgZd91O/yabJCFY8az+XSzeGyTKs0Aoo897iV1Nj6guFq8orWDS96z91oGg==
+
 totalist@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/totalist/-/totalist-1.1.0.tgz#a4d65a3e546517701e3e5c37a47a70ac97fe56df"
   integrity sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g==
 
+totalist@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/totalist/-/totalist-3.0.1.tgz#ba3a3d600c915b1a97872348f79c127475f6acf8"
+  integrity sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==
+
 tough-cookie@^4.0.0:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.2.tgz#e53e84b85f24e0b65dd526f46628db6c85f6b874"
@@ -19465,6 +23263,16 @@ tough-cookie@^4.0.0:
     universalify "^0.2.0"
     url-parse "^1.5.3"
 
+tough-cookie@^4.1.2:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.3.tgz#97b9adb0728b42280aa3d814b6b999b2ff0318bf"
+  integrity sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==
+  dependencies:
+    psl "^1.1.33"
+    punycode "^2.1.1"
+    universalify "^0.2.0"
+    url-parse "^1.5.3"
+
 tough-cookie@~2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
@@ -19487,6 +23295,13 @@ tr46@^2.1.0:
   dependencies:
     punycode "^2.1.1"
 
+tr46@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-3.0.0.tgz#555c4e297a950617e8eeddef633c87d4d9d6cbf9"
+  integrity sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==
+  dependencies:
+    punycode "^2.1.1"
+
 tr46@~0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
@@ -19541,6 +23356,20 @@ ts-essentials@^7.0.0, ts-essentials@^7.0.1:
   resolved "https://registry.yarnpkg.com/ts-essentials/-/ts-essentials-7.0.3.tgz#686fd155a02133eedcc5362dc8b5056cde3e5a38"
   integrity sha512-8+gr5+lqO3G84KdiTSMRLtuyJ+nTBVRKuCrK4lidMPdVeEp0uqC875uE5NMcaA7YYMN7XsNiFQuMvasF8HT/xQ==
 
+ts-jest@^29.1.0:
+  version "29.1.0"
+  resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-29.1.0.tgz#4a9db4104a49b76d2b368ea775b6c9535c603891"
+  integrity sha512-ZhNr7Z4PcYa+JjMl62ir+zPiNJfXJN6E8hSLnaUKhOgqcn8vb3e537cpkd0FuAfRK3sR1LSqM1MOhliXNgOFPA==
+  dependencies:
+    bs-logger "0.x"
+    fast-json-stable-stringify "2.x"
+    jest-util "^29.0.0"
+    json5 "^2.2.3"
+    lodash.memoize "4.x"
+    make-error "1.x"
+    semver "7.x"
+    yargs-parser "^21.0.1"
+
 ts-mockito@^2.6.1:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/ts-mockito/-/ts-mockito-2.6.1.tgz#bc9ee2619033934e6fad1c4455aca5b5ace34e73"
@@ -19548,7 +23377,15 @@ ts-mockito@^2.6.1:
   dependencies:
     lodash "^4.17.5"
 
-ts-node@^10.7.0, ts-node@^10.8.1, ts-node@^10.9.1:
+ts-morph@17.0.1:
+  version "17.0.1"
+  resolved "https://registry.yarnpkg.com/ts-morph/-/ts-morph-17.0.1.tgz#d85df4fcf9a1fcda1b331d52c00655f381c932d1"
+  integrity sha512-10PkHyXmrtsTvZSL+cqtJLTgFXkU43Gd0JCc0Rw6GchWbqKe0Rwgt1v3ouobTZwQzF1mGhDeAlWYBMGRV7y+3g==
+  dependencies:
+    "@ts-morph/common" "~0.18.0"
+    code-block-writer "^11.0.3"
+
+ts-node@10.9.1, ts-node@^10.7.0, ts-node@^10.8.1, ts-node@^10.9.1:
   version "10.9.1"
   resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.1.tgz#e73de9102958af9e1f0b168a6ff320e25adcff4b"
   integrity sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==
@@ -19567,6 +23404,11 @@ ts-node@^10.7.0, ts-node@^10.8.1, ts-node@^10.9.1:
     v8-compile-cache-lib "^3.0.1"
     yn "3.1.1"
 
+tsconfck@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/tsconfck/-/tsconfck-2.1.1.tgz#9b51603d2712d1f4740fa14748ca886a2e1893e5"
+  integrity sha512-ZPCkJBKASZBmBUNqGHmRhdhM8pJYDdOXp4nRgj/O0JwUwsMq50lCDRQP/M5GBNAA0elPrq4gAeu4dkaVCuKWww==
+
 tsconfig-paths@^3.14.1:
   version "3.14.1"
   resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz#ba0734599e8ea36c862798e920bcf163277b137a"
@@ -19601,6 +23443,11 @@ tslib@^2.3.0, tslib@^2.4.0:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.3.tgz#24944ba2d990940e6e982c4bea147aba80209913"
   integrity sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==
 
+tsscmp@1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/tsscmp/-/tsscmp-1.0.6.tgz#85b99583ac3589ec4bfef825b5000aa911d605eb"
+  integrity sha512-LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA==
+
 tsutils@^3.21.0:
   version "3.21.0"
   resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623"
@@ -19625,6 +23472,11 @@ tweetnacl@^0.14.3, tweetnacl@~0.14.0:
   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
   integrity sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==
 
+typanion@^3.8.0:
+  version "3.12.1"
+  resolved "https://registry.yarnpkg.com/typanion/-/typanion-3.12.1.tgz#d33deb130aba23ef6f2a3c69e7fb28148dd9089a"
+  integrity sha512-3SJF/czpzqq6G3lprGFLa6ps12yb1uQ1EmitNnep2fDMNh1aO/Zbq9sWY+3lem0zYb2oHJnQWyabTGUZ+L1ScQ==
+
 type-check@^0.4.0, type-check@~0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
@@ -19679,6 +23531,11 @@ type-fest@^0.8.1:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
   integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
 
+type-fest@^2.13.0:
+  version "2.19.0"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-2.19.0.tgz#88068015bb33036a598b952e55e9311a60fd3a9b"
+  integrity sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==
+
 type-is@~1.6.18:
   version "1.6.18"
   resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
@@ -19734,7 +23591,7 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==
 
-"typescript@^4.6.4 || ^5.0.0":
+"typescript@^4.6.4 || ^5.0.0", typescript@~5.0.4:
   version "5.0.4"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.0.4.tgz#b217fd20119bd61a94d4011274e0ab369058da3b"
   integrity sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==
@@ -19764,6 +23621,16 @@ ua-parser-js@^1.0.32:
   resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-1.0.32.tgz#786bf17df97de159d5b1c9d5e8e9e89806f8a030"
   integrity sha512-dXVsz3M4j+5tTiovFVyVqssXBu5HM47//YSOeZ9fQkdDKkfzv2v3PP1jmH6FUyPW+yCSn7aBVK1fGGKNhowdDA==
 
+ufo@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/ufo/-/ufo-1.1.2.tgz#d0d9e0fa09dece0c31ffd57bd363f030a35cfe76"
+  integrity sha512-TrY6DsjTQQgyS3E3dBaOXf0TpPD8u9FVrVYmKVegJuFw51n/YB9XPt+U6ydzFG5ZIN7+DIjPbNmXoBj9esYhgQ==
+
+uglify-js@^3.1.4:
+  version "3.17.4"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.17.4.tgz#61678cf5fa3f5b7eb789bb345df29afb8257c22c"
+  integrity sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==
+
 uid-number@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"
@@ -19833,6 +23700,13 @@ unified@^9.0.0:
     trough "^1.0.0"
     vfile "^4.0.0"
 
+union@~0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/union/-/union-0.5.0.tgz#b2c11be84f60538537b846edb9ba266ba0090075"
+  integrity sha512-N6uOhuW6zO95P3Mel2I2zMsbsanvvtgn6jVqJv4vbVcz/JN0OkL9suomjQGmWtxJQXOCqUJvquc1sMeNz/IwlA==
+  dependencies:
+    qs "^6.4.0"
+
 unique-string@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d"
@@ -19889,6 +23763,11 @@ universalify@^2.0.0:
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
   integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==
 
+unix-crypt-td-js@1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/unix-crypt-td-js/-/unix-crypt-td-js-1.1.4.tgz#4912dfad1c8aeb7d20fa0a39e4c31918c1d5d5dd"
+  integrity sha512-8rMeVYWSIyccIJscb9NdCfZKSRBKYTeVnwmiRYT2ulE3qd1RaDQ0xQDP+rI3ccIWbhu/zuo5cgN8z73belNZgw==
+
 unpipe@1.0.0, unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
@@ -19909,6 +23788,14 @@ upath@^1.2.0:
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894"
   integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==
 
+update-browserslist-db@^1.0.11:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz#9a2a641ad2907ae7b3616506f4b977851db5b940"
+  integrity sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==
+  dependencies:
+    escalade "^3.1.1"
+    picocolors "^1.0.0"
+
 update-browserslist-db@^1.0.9:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz#0f54b876545726f17d00cd9a2561e6dade943ff3"
@@ -19917,6 +23804,14 @@ update-browserslist-db@^1.0.9:
     escalade "^3.1.1"
     picocolors "^1.0.0"
 
+update-check@1.5.4:
+  version "1.5.4"
+  resolved "https://registry.yarnpkg.com/update-check/-/update-check-1.5.4.tgz#5b508e259558f1ad7dbc8b4b0457d4c9d28c8743"
+  integrity sha512-5YHsflzHP4t1G+8WGPlvKbJEbAJGCgw+Em+dGR1KmBUbr1J36SJBqlHLjR7oob7sco5hWHGQVcr9B2poIVDDTQ==
+  dependencies:
+    registry-auth-token "3.3.2"
+    registry-url "3.1.0"
+
 update-notifier@^4.1.0:
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-4.1.3.tgz#be86ee13e8ce48fb50043ff72057b5bd598e1ea3"
@@ -19943,6 +23838,11 @@ uri-js@^4.2.2:
   dependencies:
     punycode "^2.1.0"
 
+url-join@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/url-join/-/url-join-4.0.1.tgz#b642e21a2646808ffa178c4c5fda39844e12cde7"
+  integrity sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA==
+
 url-parse-lax@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c"
@@ -20115,6 +24015,15 @@ v8-to-istanbul@^8.1.0:
     convert-source-map "^1.6.0"
     source-map "^0.7.3"
 
+v8-to-istanbul@^9.0.1:
+  version "9.1.0"
+  resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-9.1.0.tgz#1b83ed4e397f58c85c266a570fc2558b5feb9265"
+  integrity sha512-6z3GW9x8G1gd+JIIgQQQxXuiJtCXeAjp6RaPEPLv62mH3iPHPxV6W3robxtCzNErRo6ZwTmzWhsbNvjyEBKzKA==
+  dependencies:
+    "@jridgewell/trace-mapping" "^0.3.12"
+    "@types/istanbul-lib-coverage" "^2.0.1"
+    convert-source-map "^1.6.0"
+
 validate-npm-package-license@^3.0.1:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
@@ -20130,6 +24039,11 @@ validate-npm-package-name@^3.0.0:
   dependencies:
     builtins "^1.0.3"
 
+validator@13.9.0, validator@^13.7.0:
+  version "13.9.0"
+  resolved "https://registry.yarnpkg.com/validator/-/validator-13.9.0.tgz#33e7b85b604f3bbce9bb1a05d5c3e22e1c2ff855"
+  integrity sha512-B+dGG8U3fdtM0/aNK4/X8CXq/EcxU2WPrPEkJGslb47qyHsxmbggTWK0yEA4qnYVNF+nxNlN88o14hIcPmSIEA==
+
 varint@^5.0.0, varint@^5.0.2, varint@~5.0.0:
   version "5.0.2"
   resolved "https://registry.yarnpkg.com/varint/-/varint-5.0.2.tgz#5b47f8a947eb668b848e034dcfa87d0ff8a7f7a4"
@@ -20145,6 +24059,76 @@ vary@^1, vary@~1.1.2:
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
   integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==
 
+verdaccio-audit@11.0.0-6-next.34:
+  version "11.0.0-6-next.34"
+  resolved "https://registry.yarnpkg.com/verdaccio-audit/-/verdaccio-audit-11.0.0-6-next.34.tgz#2d4582842853a7a00bcc493be13a63ef5dcdc320"
+  integrity sha512-TF+gnJJveEI4TGJTsVBCNwbfx5WBvlP7QoaDDxSmJQlmhzrsJ2MjhagWgAA/OoLV7p45bJ7e00v391Frv0pwnw==
+  dependencies:
+    "@verdaccio/config" "6.0.0-6-next.71"
+    "@verdaccio/core" "6.0.0-6-next.71"
+    express "4.18.2"
+    https-proxy-agent "5.0.1"
+    node-fetch cjs
+
+verdaccio-htpasswd@11.0.0-6-next.41:
+  version "11.0.0-6-next.41"
+  resolved "https://registry.yarnpkg.com/verdaccio-htpasswd/-/verdaccio-htpasswd-11.0.0-6-next.41.tgz#2e6ce1e47a09025a76ec132e951e4267c4c33aff"
+  integrity sha512-HS1/3No2W7Dhl9DJ3tXUDgSOIL3do5tW2O2OvRVPc6aNKbqXFg22FIqjzpn1yG2sydTuBFKUSjMvmk/1oliKPg==
+  dependencies:
+    "@verdaccio/core" "6.0.0-6-next.71"
+    "@verdaccio/file-locking" "11.0.0-6-next.7"
+    apache-md5 "1.1.8"
+    bcryptjs "2.4.3"
+    core-js "3.30.2"
+    debug "4.3.4"
+    http-errors "2.0.0"
+    unix-crypt-td-js "1.1.4"
+
+verdaccio@^5.0.4:
+  version "5.25.0"
+  resolved "https://registry.yarnpkg.com/verdaccio/-/verdaccio-5.25.0.tgz#fefe45ca72b6e612a3ef79bb80138947871e8ca5"
+  integrity sha512-h/BDAudOZtwC52waErxCjZA+YKuUi7Ojt3haRGxZ1ZTL26BkbjaKkzt0Y72Z2bauRLxmwtGevJWm2LV7ZTeIug==
+  dependencies:
+    "@verdaccio/config" "6.0.0-6-next.71"
+    "@verdaccio/core" "6.0.0-6-next.71"
+    "@verdaccio/local-storage" "10.3.3"
+    "@verdaccio/logger-7" "6.0.0-6-next.16"
+    "@verdaccio/middleware" "6.0.0-6-next.50"
+    "@verdaccio/search" "6.0.0-6-next.2"
+    "@verdaccio/signature" "6.0.0-6-next.2"
+    "@verdaccio/streams" "10.2.1"
+    "@verdaccio/tarball" "11.0.0-6-next.40"
+    "@verdaccio/ui-theme" "6.0.0-6-next.71"
+    "@verdaccio/url" "11.0.0-6-next.37"
+    "@verdaccio/utils" "6.0.0-6-next.39"
+    JSONStream "1.3.5"
+    async "3.2.4"
+    body-parser "1.20.2"
+    clipanion "3.2.0"
+    compression "1.7.4"
+    cookies "0.8.0"
+    cors "2.8.5"
+    debug "^4.3.4"
+    envinfo "7.8.1"
+    express "4.18.2"
+    express-rate-limit "5.5.1"
+    fast-safe-stringify "2.1.1"
+    handlebars "4.7.7"
+    js-yaml "4.1.0"
+    jsonwebtoken "9.0.0"
+    kleur "4.1.5"
+    lodash "4.17.21"
+    lru-cache "7.18.3"
+    mime "3.0.0"
+    mkdirp "1.0.4"
+    mv "2.1.1"
+    pkginfo "0.4.1"
+    request "2.88.2"
+    semver "7.5.1"
+    validator "13.9.0"
+    verdaccio-audit "11.0.0-6-next.34"
+    verdaccio-htpasswd "11.0.0-6-next.41"
+
 verror@1.10.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
@@ -20172,6 +24156,92 @@ vfile@^4.0.0:
     unist-util-stringify-position "^2.0.0"
     vfile-message "^2.0.0"
 
+vite-node@0.31.4:
+  version "0.31.4"
+  resolved "https://registry.yarnpkg.com/vite-node/-/vite-node-0.31.4.tgz#0437f76c35fa83f0a868d3fb5896ca9e164291f5"
+  integrity sha512-uzL377GjJtTbuc5KQxVbDu2xfU/x0wVjUtXQR2ihS21q/NK6ROr4oG0rsSkBBddZUVCwzfx22in76/0ZZHXgkQ==
+  dependencies:
+    cac "^6.7.14"
+    debug "^4.3.4"
+    mlly "^1.2.0"
+    pathe "^1.1.0"
+    picocolors "^1.0.0"
+    vite "^3.0.0 || ^4.0.0"
+
+vite-plugin-dts@~1.7.1:
+  version "1.7.3"
+  resolved "https://registry.yarnpkg.com/vite-plugin-dts/-/vite-plugin-dts-1.7.3.tgz#cf0c243fff9ae3fc1f103987b97439b3bf813f15"
+  integrity sha512-u3t45p6fTbzUPMkwYe0ESwuUeiRMlwdPfD3dRyDKUwLe2WmEYcFyVp2o9/ke2EMrM51lQcmNWdV9eLcgjD1/ng==
+  dependencies:
+    "@microsoft/api-extractor" "^7.33.5"
+    "@rollup/pluginutils" "^5.0.2"
+    "@rushstack/node-core-library" "^3.53.2"
+    debug "^4.3.4"
+    fast-glob "^3.2.12"
+    fs-extra "^10.1.0"
+    kolorist "^1.6.0"
+    ts-morph "17.0.1"
+
+vite-plugin-eslint@^1.8.1:
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/vite-plugin-eslint/-/vite-plugin-eslint-1.8.1.tgz#0381b8272e7f0fd8b663311b64f7608d55d8b04c"
+  integrity sha512-PqdMf3Y2fLO9FsNPmMX+//2BF5SF8nEWspZdgl4kSt7UvHDRHVVfHvxsD7ULYzZrJDGRxR81Nq7TOFgwMnUang==
+  dependencies:
+    "@rollup/pluginutils" "^4.2.1"
+    "@types/eslint" "^8.4.5"
+    rollup "^2.77.2"
+
+vite-tsconfig-paths@^4.0.2:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/vite-tsconfig-paths/-/vite-tsconfig-paths-4.2.0.tgz#bd2647d3eadafb65a10fc98a2ca565211f2eaf63"
+  integrity sha512-jGpus0eUy5qbbMVGiTxCL1iB9ZGN6Bd37VGLJU39kTDD6ZfULTTb1bcc5IeTWqWJKiWV5YihCaibeASPiGi8kw==
+  dependencies:
+    debug "^4.1.1"
+    globrex "^0.1.2"
+    tsconfck "^2.1.0"
+
+"vite@^3.0.0 || ^4.0.0", vite@^4.3.4:
+  version "4.3.9"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-4.3.9.tgz#db896200c0b1aa13b37cdc35c9e99ee2fdd5f96d"
+  integrity sha512-qsTNZjO9NoJNW7KnOrgYwczm0WctJ8m/yqYAMAK9Lxt4SoySUfS5S8ia9K7JHpa3KEeMfyF8LoJ3c5NeBJy6pg==
+  dependencies:
+    esbuild "^0.17.5"
+    postcss "^8.4.23"
+    rollup "^3.21.0"
+  optionalDependencies:
+    fsevents "~2.3.2"
+
+vitest@^0.31.0:
+  version "0.31.4"
+  resolved "https://registry.yarnpkg.com/vitest/-/vitest-0.31.4.tgz#5abe02562675262949c10e40811f348a80f6b2a6"
+  integrity sha512-GoV0VQPmWrUFOZSg3RpQAPN+LPmHg2/gxlMNJlyxJihkz6qReHDV6b0pPDcqFLNEPya4tWJ1pgwUNP9MLmUfvQ==
+  dependencies:
+    "@types/chai" "^4.3.5"
+    "@types/chai-subset" "^1.3.3"
+    "@types/node" "*"
+    "@vitest/expect" "0.31.4"
+    "@vitest/runner" "0.31.4"
+    "@vitest/snapshot" "0.31.4"
+    "@vitest/spy" "0.31.4"
+    "@vitest/utils" "0.31.4"
+    acorn "^8.8.2"
+    acorn-walk "^8.2.0"
+    cac "^6.7.14"
+    chai "^4.3.7"
+    concordance "^5.0.4"
+    debug "^4.3.4"
+    local-pkg "^0.4.3"
+    magic-string "^0.30.0"
+    pathe "^1.1.0"
+    picocolors "^1.0.0"
+    std-env "^3.3.2"
+    strip-literal "^1.0.1"
+    tinybench "^2.5.0"
+    tinypool "^0.5.0"
+    vite "^3.0.0 || ^4.0.0"
+    vite-node "0.31.4"
+    why-is-node-running "^2.2.2"
+
 w3c-hr-time@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd"
@@ -20186,7 +24256,25 @@ w3c-xmlserializer@^2.0.0:
   dependencies:
     xml-name-validator "^3.0.0"
 
-walker@^1.0.7:
+w3c-xmlserializer@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz#aebdc84920d806222936e3cdce408e32488a3073"
+  integrity sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw==
+  dependencies:
+    xml-name-validator "^4.0.0"
+
+wait-on@7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/wait-on/-/wait-on-7.0.1.tgz#5cff9f8427e94f4deacbc2762e6b0a489b19eae9"
+  integrity sha512-9AnJE9qTjRQOlTZIldAaf/da2eW0eSRSgcqq85mXQja/DW3MriHxkpODDSUEg+Gri/rKEcXUZHe+cevvYItaog==
+  dependencies:
+    axios "^0.27.2"
+    joi "^17.7.0"
+    lodash "^4.17.21"
+    minimist "^1.2.7"
+    rxjs "^7.8.0"
+
+walker@^1.0.7, walker@^1.0.8:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.8.tgz#bd498db477afe573dc04185f011d3ab8a8d7653f"
   integrity sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==
@@ -20589,6 +24677,11 @@ webidl-conversions@^6.1.0:
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514"
   integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==
 
+webidl-conversions@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-7.0.0.tgz#256b4e1882be7debbf01d05f0aa2039778ea080a"
+  integrity sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==
+
 webpack-bundle-analyzer@^4.7.0:
   version "4.7.0"
   resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.7.0.tgz#33c1c485a7fcae8627c547b5c3328b46de733c66"
@@ -20755,6 +24848,11 @@ websocket@^1.0.32:
     utf-8-validate "^5.0.2"
     yaeti "^0.0.6"
 
+well-known-symbols@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/well-known-symbols/-/well-known-symbols-2.0.0.tgz#e9c7c07dbd132b7b84212c8174391ec1f9871ba5"
+  integrity sha512-ZMjC3ho+KXo0BfJb7JgtQ5IBuvnShdlACNkKkdsqBmYw3bPAaJfPeYUo6tLUaT5tG/Gkh7xkpBhKRQ9e7pyg9Q==
+
 whatwg-encoding@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz#5abacf777c32166a51d085d6b4f3e7d27113ddb0"
@@ -20762,6 +24860,13 @@ whatwg-encoding@^1.0.5:
   dependencies:
     iconv-lite "0.4.24"
 
+whatwg-encoding@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz#e7635f597fd87020858626805a2729fa7698ac53"
+  integrity sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==
+  dependencies:
+    iconv-lite "0.6.3"
+
 whatwg-fetch@>=0.10.0, whatwg-fetch@^3.6.2:
   version "3.6.2"
   resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz#dced24f37f2624ed0281725d51d0e2e3fe677f8c"
@@ -20772,6 +24877,19 @@ whatwg-mimetype@^2.3.0:
   resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf"
   integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==
 
+whatwg-mimetype@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz#5fa1a7623867ff1af6ca3dc72ad6b8a4208beba7"
+  integrity sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==
+
+whatwg-url@^11.0.0:
+  version "11.0.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-11.0.0.tgz#0a849eebb5faf2119b901bb76fd795c2848d4018"
+  integrity sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==
+  dependencies:
+    tr46 "^3.0.0"
+    webidl-conversions "^7.0.0"
+
 whatwg-url@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
@@ -20850,6 +24968,14 @@ which@^2.0.1, which@^2.0.2:
   dependencies:
     isexe "^2.0.0"
 
+why-is-node-running@^2.2.2:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/why-is-node-running/-/why-is-node-running-2.2.2.tgz#4185b2b4699117819e7154594271e7e344c9973e"
+  integrity sha512-6tSwToZxTOcotxHeA+qGCq1mVzKR3CwcJGmVcY+QE8SHy6TnpFnh8PAvPNHYr7EcuVeG0QSMxtYCuO1ta/G/oA==
+  dependencies:
+    siginfo "^2.0.0"
+    stackback "0.0.2"
+
 wide-align@^1.1.0:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3"
@@ -20864,6 +24990,13 @@ widest-line@^3.1.0:
   dependencies:
     string-width "^4.0.0"
 
+widest-line@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-4.0.1.tgz#a0fc673aaba1ea6f0a0d35b3c2795c9a9cc2ebf2"
+  integrity sha512-o0cyEG0e8GPzT4iGHphIOh0cJOV8fivsXxddQasHPHfoZf1ZexrfeA21w2NaEN1RHE+fXlfISmOE8R9N3u3Qig==
+  dependencies:
+    string-width "^5.0.1"
+
 wildcard@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec"
@@ -20874,6 +25007,11 @@ word-wrap@^1.2.3, word-wrap@~1.2.3:
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
   integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
 
+wordwrap@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
+  integrity sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==
+
 wordwrapjs@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/wordwrapjs/-/wordwrapjs-4.0.1.tgz#d9790bccfb110a0fc7836b5ebce0937b37a8b98f"
@@ -21092,6 +25230,15 @@ wrap-ansi@^7.0.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
+wrap-ansi@^8.0.1:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"
+  integrity sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==
+  dependencies:
+    ansi-styles "^6.1.0"
+    string-width "^5.0.1"
+    strip-ansi "^7.0.1"
+
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
@@ -21107,6 +25254,14 @@ write-file-atomic@^3.0.0:
     signal-exit "^3.0.2"
     typedarray-to-buffer "^3.1.5"
 
+write-file-atomic@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-4.0.2.tgz#a9df01ae5b77858a027fd2e80768ee433555fcfd"
+  integrity sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==
+  dependencies:
+    imurmurhash "^0.1.4"
+    signal-exit "^3.0.7"
+
 ws@7.4.6:
   version "7.4.6"
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c"
@@ -21131,6 +25286,11 @@ ws@^7.3.1, ws@^7.4.0, ws@^7.4.5, ws@^7.4.6, ws@^7.5.1:
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591"
   integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==
 
+ws@^8.11.0:
+  version "8.13.0"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.13.0.tgz#9a9fb92f93cf41512a0735c8f4dd09b8a1211cd0"
+  integrity sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==
+
 ws@^8.4.2, ws@^8.5.0:
   version "8.12.0"
   resolved "https://registry.yarnpkg.com/ws/-/ws-8.12.0.tgz#485074cc392689da78e1828a9ff23585e06cddd8"
@@ -21183,6 +25343,11 @@ xml-name-validator@^3.0.0:
   resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"
   integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==
 
+xml-name-validator@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-4.0.0.tgz#79a006e2e63149a8600f15430f0a4725d1524835"
+  integrity sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==
+
 xml-parse-from-string@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/xml-parse-from-string/-/xml-parse-from-string-1.0.1.tgz#a9029e929d3dbcded169f3c6e28238d95a5d5a28"
@@ -21256,7 +25421,7 @@ yargs-parser@20.2.4:
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54"
   integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==
 
-yargs-parser@21.1.1, yargs-parser@>=21.1.1, yargs-parser@^21.1.1:
+yargs-parser@21.1.1, yargs-parser@>=21.1.1, yargs-parser@^21.0.1, yargs-parser@^21.1.1:
   version "21.1.1"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
   integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
@@ -21358,7 +25523,7 @@ yargs@^17.0.0:
     y18n "^5.0.5"
     yargs-parser "^21.1.1"
 
-yargs@^17.6.2:
+yargs@^17.3.1, yargs@^17.6.2:
   version "17.7.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"
   integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==
@@ -21394,6 +25559,35 @@ yocto-queue@^0.1.0:
   resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
   integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
 
+yocto-queue@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-1.0.0.tgz#7f816433fb2cbc511ec8bf7d263c3b58a1a3c251"
+  integrity sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==
+
+yup@0.32.11:
+  version "0.32.11"
+  resolved "https://registry.yarnpkg.com/yup/-/yup-0.32.11.tgz#d67fb83eefa4698607982e63f7ca4c5ed3cf18c5"
+  integrity sha512-Z2Fe1bn+eLstG8DRR6FTavGD+MeAwyfmouhHsIUgaADz8jvFKbO/fXc2trJKZg+5EBjh4gGm3iU/t3onKlXHIg==
+  dependencies:
+    "@babel/runtime" "^7.15.4"
+    "@types/lodash" "^4.14.175"
+    lodash "^4.17.21"
+    lodash-es "^4.17.21"
+    nanoclone "^0.2.1"
+    property-expr "^2.0.4"
+    toposort "^2.0.2"
+
+z-schema@~5.0.2:
+  version "5.0.6"
+  resolved "https://registry.yarnpkg.com/z-schema/-/z-schema-5.0.6.tgz#46d6a687b15e4a4369e18d6cb1c7b8618fc256c5"
+  integrity sha512-+XR1GhnWklYdfr8YaZv/iu+vY+ux7V5DS5zH1DQf6bO5ufrt/5cgNhVO5qyhsjFXvsqQb/f08DWE9b6uPscyAg==
+  dependencies:
+    lodash.get "^4.4.2"
+    lodash.isequal "^4.5.0"
+    validator "^13.7.0"
+  optionalDependencies:
+    commander "^10.0.0"
+
 zustand@^4.3.5:
   version "4.3.7"
   resolved "https://registry.yarnpkg.com/zustand/-/zustand-4.3.7.tgz#501b1f0393a7f1d103332e45ab574be5747fedce"

From b72b1901b24aff05e67bba2539fe3b34e8290b0a Mon Sep 17 00:00:00 2001
From: Anxo Rodriguez <anxolin@gmail.com>
Date: Thu, 22 Jun 2023 14:05:53 +0100
Subject: [PATCH 29/67] chore: Add `widget-lib` and publish to NPM (#2704)

* chore: add widget lib

* fix: fix build dir

* feat: implement widget and tests

* docs: improve docs

* chore: publish to npm
---
 jest.config.app.ts                        |  7 +++
 jest.config.ts                            |  4 +-
 project.json                              |  2 +-
 src/libs/ui-utils/package.json            |  2 +-
 src/libs/widget-lib/.eslintrc.json        | 18 ++++++
 src/libs/widget-lib/README.md             | 62 +++++++++++++++++++
 src/libs/widget-lib/jest.config.ts        | 10 +++
 src/libs/widget-lib/package.json          | 24 ++++++++
 src/libs/widget-lib/project.json          | 42 +++++++++++++
 src/libs/widget-lib/src/JsonRpcManager.ts | 73 ++++++++++++++++++++++
 src/libs/widget-lib/src/consts.ts         | 11 ++++
 src/libs/widget-lib/src/cowSwapWidget.ts  | 55 +++++++++++++++++
 src/libs/widget-lib/src/index.ts          |  3 +
 src/libs/widget-lib/src/types.ts          | 47 ++++++++++++++
 src/libs/widget-lib/src/utils.spec.ts     | 75 +++++++++++++++++++++++
 src/libs/widget-lib/src/utils.ts          | 43 +++++++++++++
 src/libs/widget-lib/tsconfig.json         | 22 +++++++
 src/libs/widget-lib/tsconfig.lib.json     | 10 +++
 src/libs/widget-lib/tsconfig.spec.json    |  9 +++
 src/libs/widget-lib/vite.config.ts        | 48 +++++++++++++++
 tools/scripts/publish.mjs                 | 17 +++--
 tsconfig.base.json                        |  3 +-
 22 files changed, 576 insertions(+), 11 deletions(-)
 create mode 100644 jest.config.app.ts
 create mode 100644 src/libs/widget-lib/.eslintrc.json
 create mode 100644 src/libs/widget-lib/README.md
 create mode 100644 src/libs/widget-lib/jest.config.ts
 create mode 100644 src/libs/widget-lib/package.json
 create mode 100644 src/libs/widget-lib/project.json
 create mode 100644 src/libs/widget-lib/src/JsonRpcManager.ts
 create mode 100644 src/libs/widget-lib/src/consts.ts
 create mode 100644 src/libs/widget-lib/src/cowSwapWidget.ts
 create mode 100644 src/libs/widget-lib/src/index.ts
 create mode 100644 src/libs/widget-lib/src/types.ts
 create mode 100644 src/libs/widget-lib/src/utils.spec.ts
 create mode 100644 src/libs/widget-lib/src/utils.ts
 create mode 100644 src/libs/widget-lib/tsconfig.json
 create mode 100644 src/libs/widget-lib/tsconfig.lib.json
 create mode 100644 src/libs/widget-lib/tsconfig.spec.json
 create mode 100644 src/libs/widget-lib/vite.config.ts

diff --git a/jest.config.app.ts b/jest.config.app.ts
new file mode 100644
index 0000000000..9b66958ca6
--- /dev/null
+++ b/jest.config.app.ts
@@ -0,0 +1,7 @@
+import { getJestProjects } from '@nx/jest'
+
+const config = {
+  projects: getJestProjects(),
+}
+
+export default config
diff --git a/jest.config.ts b/jest.config.ts
index 9b66958ca6..64f7210caf 100644
--- a/jest.config.ts
+++ b/jest.config.ts
@@ -1,7 +1,5 @@
 import { getJestProjects } from '@nx/jest'
 
-const config = {
+export default {
   projects: getJestProjects(),
 }
-
-export default config
diff --git a/project.json b/project.json
index ced528c01b..8bf23e6375 100644
--- a/project.json
+++ b/project.json
@@ -33,7 +33,7 @@
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectName}"],
       "options": {
-        "jestConfig": "jest.config.ts",
+        "jestConfig": "jest.config.app.ts",
         "passWithNoTests": true
       },
       "configurations": {
diff --git a/src/libs/ui-utils/package.json b/src/libs/ui-utils/package.json
index c098259ef5..63666735b9 100644
--- a/src/libs/ui-utils/package.json
+++ b/src/libs/ui-utils/package.json
@@ -1,5 +1,5 @@
 {
   "name": "@cowprotocol/ui-utils",
-  "version": "0.0.1",
+  "version": "0.0.3",
   "type": "commonjs"
 }
diff --git a/src/libs/widget-lib/.eslintrc.json b/src/libs/widget-lib/.eslintrc.json
new file mode 100644
index 0000000000..3456be9b90
--- /dev/null
+++ b/src/libs/widget-lib/.eslintrc.json
@@ -0,0 +1,18 @@
+{
+  "extends": ["../../../.eslintrc.json"],
+  "ignorePatterns": ["!**/*"],
+  "overrides": [
+    {
+      "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
+      "rules": {}
+    },
+    {
+      "files": ["*.ts", "*.tsx"],
+      "rules": {}
+    },
+    {
+      "files": ["*.js", "*.jsx"],
+      "rules": {}
+    }
+  ]
+}
diff --git a/src/libs/widget-lib/README.md b/src/libs/widget-lib/README.md
new file mode 100644
index 0000000000..521a7982f5
--- /dev/null
+++ b/src/libs/widget-lib/README.md
@@ -0,0 +1,62 @@
+# CoW Swap widget-lib
+
+## Use it
+
+Install dependency
+
+```bash
+# Install the dependency using NPM
+npm install @cowprotocol/widget-lib --save
+
+# ...or alternativelly use YARN
+yarn add @cowprotocol/widget-lib
+```
+
+Create an empty div somewhere in your website:
+
+```html
+<div id="cowswap-widget"></div>
+```
+
+Import the widget and initialise it:
+
+```js
+import { cowSwapWidget } from '@cowprotocol/widget-lib'
+
+// Initialise the widget
+const widgetContainer = document.getElementById('cowswap-widget')
+cowSwapWidget({
+  container: widgetContainer
+})
+
+
+// Additionally, you can pass some additional params to customise your widget
+provider = /* instantiate your own web3 provider */
+cowSwapWidget({
+  container: widgetContainer,
+  width: 600
+  height: 640
+  urlParams: {
+    sell: { asset: 'DAI' },
+    buy: { asset: 'USDC', amount: '0.1' }
+  },
+  provider
+})
+```
+
+## Developers
+
+```bash
+# Test
+nx test widget-lib
+
+# Build the library
+nx build widget-lib
+
+# Publish to NPM
+nx publish widget-lib --ver 0.0.7 --tag latest
+```
+
+## Running unit tests
+
+Run `nx test widget-lib` to execute the unit tests via [Jest](https://jestjs.io).
diff --git a/src/libs/widget-lib/jest.config.ts b/src/libs/widget-lib/jest.config.ts
new file mode 100644
index 0000000000..6602c1b24a
--- /dev/null
+++ b/src/libs/widget-lib/jest.config.ts
@@ -0,0 +1,10 @@
+/* eslint-disable */
+export default {
+  displayName: 'widget-lib',
+  preset: '../../../jest.preset.js',
+  transform: {
+    '^.+\\.[tj]s$': ['ts-jest', { tsconfig: '<rootDir>/tsconfig.spec.json' }],
+  },
+  moduleFileExtensions: ['ts', 'js', 'html'],
+  coverageDirectory: '../../../coverage/libs/widget-lib',
+}
diff --git a/src/libs/widget-lib/package.json b/src/libs/widget-lib/package.json
new file mode 100644
index 0000000000..4c63ac8c32
--- /dev/null
+++ b/src/libs/widget-lib/package.json
@@ -0,0 +1,24 @@
+{
+  "name": "@cowprotocol/widget-lib",
+  "version": "0.0.5",
+  "type": "commonjs",
+  "description": "CoW Swap Widget Library. Allows you to easily embed a CoW Swap widget on your website.",
+  "main": "index.js",
+  "exports": {
+    "import": "./index.js",
+    "require": "./index.mjs"
+  },
+  "license": "ISC",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/cowprotocol/cowswap"
+  },
+  "keywords": [
+    "cowprotocol",
+    "widget",
+    "cowswap",
+    "dex",
+    "widget-lib"
+  ],
+  "dependencies": {}
+}
diff --git a/src/libs/widget-lib/project.json b/src/libs/widget-lib/project.json
new file mode 100644
index 0000000000..cbc42d9833
--- /dev/null
+++ b/src/libs/widget-lib/project.json
@@ -0,0 +1,42 @@
+{
+  "name": "widget-lib",
+  "$schema": "../../../node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "src/libs/widget-lib/src",
+  "projectType": "library",
+
+  "targets": {
+    "build": {
+      "executor": "@nx/vite:build",
+      "outputs": ["{options.outputPath}"],
+      "options": {
+        "outputPath": "dist/libs/widget-lib"
+      }
+    },
+    "publish": {
+      "command": "node tools/scripts/publish.mjs widget-lib {args.ver} {args.tag}",
+      "dependsOn": ["build"]
+    },
+    "lint": {
+      "executor": "@nx/linter:eslint",
+      "outputs": ["{options.outputFile}"],
+      "options": {
+        "lintFilePatterns": ["src/libs/widget-lib/**/*.ts"]
+      }
+    },
+    "test": {
+      "executor": "@nx/jest:jest",
+      "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
+      "options": {
+        "jestConfig": "src/libs/widget-lib/jest.config.ts",
+        "passWithNoTests": true
+      },
+      "configurations": {
+        "ci": {
+          "ci": true,
+          "codeCoverage": true
+        }
+      }
+    }
+  },
+  "tags": []
+}
diff --git a/src/libs/widget-lib/src/JsonRpcManager.ts b/src/libs/widget-lib/src/JsonRpcManager.ts
new file mode 100644
index 0000000000..640357cc93
--- /dev/null
+++ b/src/libs/widget-lib/src/JsonRpcManager.ts
@@ -0,0 +1,73 @@
+import { EthereumProvider, JsonRpcRequest } from './types'
+
+const JSON_PRC_V = '2.0'
+const TARGET_ORIGIN = '*'
+const EVENTS = ['connect', 'disconnect', 'chainChanged', 'accountsChanged']
+
+export class JsonRpcManager {
+  ethereumProvider: EthereumProvider | null = null
+
+  requests: { [key: string]: JsonRpcRequest } = {}
+
+  constructor(private contentWindow: Window) {
+    window.addEventListener('message', this.processEvent)
+  }
+
+  disconnect() {
+    this.ethereumProvider = null
+    window.removeEventListener('message', this.processEvent)
+  }
+
+  onConnect(ethereumProvider: EthereumProvider) {
+    this.ethereumProvider = ethereumProvider
+
+    Object.keys(this.requests).forEach((key) => {
+      this.processRequest(this.requests[key])
+    })
+
+    this.requests = {}
+
+    EVENTS.forEach((event) => {
+      ethereumProvider.on(event, (params: unknown): void => {
+        this.postMessage({ method: event, params: [params] })
+      })
+    })
+  }
+
+  processRequest(request: JsonRpcRequest) {
+    if (!this.ethereumProvider) return
+
+    const request$ =
+      request.method === 'enable' //
+        ? this.ethereumProvider.enable()
+        : this.ethereumProvider.request(request)
+
+    request$
+      .then((result) => {
+        this.postMessage({ id: request.id, result })
+      })
+      .catch((error) => {
+        this.postMessage({ id: request.id, error })
+      })
+  }
+
+  private processEvent = (event: MessageEvent) => {
+    if (event.data.jsonrpc === '2.0') {
+      if (this.ethereumProvider) {
+        this.processRequest(event.data)
+      } else {
+        this.requests[event.data.id] = event.data
+      }
+    }
+  }
+
+  private postMessage(params: { [key: string]: unknown }) {
+    this.contentWindow.postMessage(
+      {
+        jsonrpc: JSON_PRC_V,
+        ...params,
+      },
+      TARGET_ORIGIN
+    )
+  }
+}
diff --git a/src/libs/widget-lib/src/consts.ts b/src/libs/widget-lib/src/consts.ts
new file mode 100644
index 0000000000..a1464e3e38
--- /dev/null
+++ b/src/libs/widget-lib/src/consts.ts
@@ -0,0 +1,11 @@
+import { CowSwapWidgetEnv } from './types'
+
+export const DEFAULT_CHAIN = 1
+export const DEFAULT_WIDTH = 400
+export const DEFAULT_HEIGHT = 640
+
+export const COWSWAP_URLS: Record<CowSwapWidgetEnv, string> = {
+  local: 'http://localhost:3000',
+  barn: 'https://barn.cow.fi',
+  prod: 'http://swap.cow.fi',
+}
diff --git a/src/libs/widget-lib/src/cowSwapWidget.ts b/src/libs/widget-lib/src/cowSwapWidget.ts
new file mode 100644
index 0000000000..bb003f93e9
--- /dev/null
+++ b/src/libs/widget-lib/src/cowSwapWidget.ts
@@ -0,0 +1,55 @@
+import { DEFAULT_HEIGHT, DEFAULT_WIDTH } from './consts'
+import { JsonRpcManager } from './JsonRpcManager'
+import { CowSwapWidgetParams, CowSwapWidgetUrlParams } from './types'
+import { buildTradeAmountsQuery, buildWidgetPath, buildWidgetUrl } from './utils'
+
+const COW_SWAP_WIDGET_KEY = '@cowprotocol/widget-lib'
+
+type UpdateWidgetCallback = (params: CowSwapWidgetUrlParams) => void
+
+export function cowSwapWidget(params: CowSwapWidgetParams): UpdateWidgetCallback {
+  const { container, provider } = params
+  const iframe = createIframe(params)
+
+  container.innerHTML = ''
+  container.appendChild(iframe)
+
+  const { contentWindow } = iframe
+
+  if (!contentWindow) throw new Error('Iframe does not contain a window!')
+
+  if (provider) {
+    const jsonRpcManager = new JsonRpcManager(contentWindow)
+
+    jsonRpcManager.onConnect(provider)
+  }
+
+  return (params: CowSwapWidgetUrlParams) => updateWidget(params, contentWindow)
+}
+
+function updateWidget(params: CowSwapWidgetUrlParams, contentWindow: Window) {
+  const pathname = buildWidgetPath(params)
+  const search = buildTradeAmountsQuery(params).toString()
+
+  contentWindow.postMessage(
+    {
+      key: COW_SWAP_WIDGET_KEY,
+      pathname,
+      search,
+    },
+    '*'
+  )
+}
+
+function createIframe(params: CowSwapWidgetParams): HTMLIFrameElement {
+  const { width = DEFAULT_WIDTH, height = DEFAULT_HEIGHT } = params
+
+  const iframe = document.createElement('iframe')
+
+  iframe.src = buildWidgetUrl(params.urlParams ?? {})
+  iframe.width = `${width}px`
+  iframe.height = `${height}px`
+  iframe.style.border = '0'
+
+  return iframe
+}
diff --git a/src/libs/widget-lib/src/index.ts b/src/libs/widget-lib/src/index.ts
new file mode 100644
index 0000000000..3a727f83fd
--- /dev/null
+++ b/src/libs/widget-lib/src/index.ts
@@ -0,0 +1,3 @@
+export { cowSwapWidget } from './cowSwapWidget'
+export { COWSWAP_URLS } from './consts'
+export * from './types'
diff --git a/src/libs/widget-lib/src/types.ts b/src/libs/widget-lib/src/types.ts
new file mode 100644
index 0000000000..d0484fb97f
--- /dev/null
+++ b/src/libs/widget-lib/src/types.ts
@@ -0,0 +1,47 @@
+declare global {
+  interface Window {
+    ethereum?: EthereumProvider
+  }
+}
+
+export interface JsonRpcRequest {
+  id: number
+  method: string
+  params: unknown[]
+}
+
+// https://eips.ethereum.org/EIPS/eip-1193
+export interface EthereumProvider {
+  on(event: string, args: unknown): void
+  request<T>(params: JsonRpcRequest): Promise<T>
+  enable(): Promise<void>
+}
+
+export type CowSwapWidgetEnv = 'local' | 'prod' | 'barn'
+
+export type CowSwapTheme = 'dark' | 'light'
+
+interface TradeAsset {
+  asset: string
+  amount?: string
+}
+
+export interface TradeAssets {
+  sell: TradeAsset
+  buy: TradeAsset
+}
+
+export interface CowSwapWidgetUrlParams {
+  chainId?: number
+  env?: CowSwapWidgetEnv
+  tradeAssets?: TradeAssets
+  theme?: CowSwapTheme
+}
+
+export interface CowSwapWidgetParams {
+  container: HTMLElement
+  width?: number
+  height?: number
+  urlParams?: CowSwapWidgetUrlParams
+  provider?: EthereumProvider
+}
diff --git a/src/libs/widget-lib/src/utils.spec.ts b/src/libs/widget-lib/src/utils.spec.ts
new file mode 100644
index 0000000000..46c9cd0c52
--- /dev/null
+++ b/src/libs/widget-lib/src/utils.spec.ts
@@ -0,0 +1,75 @@
+import { buildWidgetUrl } from './utils'
+
+describe('buildWidgetUrl', () => {
+  it('minimal config', () => {
+    const url = buildWidgetUrl({})
+    expect(url).toEqual('http://swap.cow.fi/#/1/swap/widget/?')
+  })
+
+  describe('env', () => {
+    it('local', () => {
+      const url = buildWidgetUrl({ env: 'local' })
+      expect(url).toEqual('http://localhost:3000/#/1/swap/widget/?')
+    })
+    it('prod', () => {
+      const url = buildWidgetUrl({ env: 'prod' })
+      expect(url).toEqual('http://swap.cow.fi/#/1/swap/widget/?')
+    })
+
+    it('barn', () => {
+      const url = buildWidgetUrl({ env: 'barn' })
+      expect(url).toEqual('https://barn.cow.fi/#/1/swap/widget/?')
+    })
+  })
+
+  describe('chainId', () => {
+    it('mainnet', () => {
+      const url = buildWidgetUrl({ chainId: 1 })
+      expect(url).toEqual('http://swap.cow.fi/#/1/swap/widget/?')
+    })
+    it('gnosis chain', () => {
+      const url = buildWidgetUrl({ chainId: 5 })
+      expect(url).toEqual('http://swap.cow.fi/#/5/swap/widget/?')
+    })
+  })
+
+  describe('theme', () => {
+    it('dark', () => {
+      const url = buildWidgetUrl({ theme: 'dark' })
+      expect(url).toEqual('http://swap.cow.fi/#/1/swap/widget/?theme=dark')
+    })
+    it('light', () => {
+      const url = buildWidgetUrl({ theme: 'light' })
+      expect(url).toEqual('http://swap.cow.fi/#/1/swap/widget/?theme=light')
+    })
+  })
+
+  describe('trade assets', () => {
+    it('without amounts', () => {
+      const url = buildWidgetUrl({ tradeAssets: { sell: { asset: 'WETH' }, buy: { asset: 'COW' } } })
+      expect(url).toEqual('http://swap.cow.fi/#/1/swap/widget/WETH/COW?')
+    })
+
+    it('with sell amount', () => {
+      const url = buildWidgetUrl({ tradeAssets: { sell: { asset: 'DAI', amount: '0.1' }, buy: { asset: 'USDC' } } })
+      expect(url).toEqual('http://swap.cow.fi/#/1/swap/widget/DAI/USDC?sellAmount=0.1')
+    })
+
+    it('with buy amount', () => {
+      const url = buildWidgetUrl({ tradeAssets: { sell: { asset: 'DAI' }, buy: { asset: 'USDC', amount: '0.1' } } })
+      expect(url).toEqual('http://swap.cow.fi/#/1/swap/widget/DAI/USDC?buyAmount=0.1')
+    })
+  })
+
+  describe('all config', () => {
+    it('dark', () => {
+      const url = buildWidgetUrl({
+        env: 'barn',
+        chainId: 100,
+        theme: 'light',
+        tradeAssets: { sell: { asset: 'DAI', amount: '0.1' }, buy: { asset: 'USDC', amount: '0.1' } },
+      })
+      expect(url).toEqual('https://barn.cow.fi/#/100/swap/widget/DAI/USDC?sellAmount=0.1&buyAmount=0.1&theme=light')
+    })
+  })
+})
diff --git a/src/libs/widget-lib/src/utils.ts b/src/libs/widget-lib/src/utils.ts
new file mode 100644
index 0000000000..0cd02caad7
--- /dev/null
+++ b/src/libs/widget-lib/src/utils.ts
@@ -0,0 +1,43 @@
+import { COWSWAP_URLS, DEFAULT_CHAIN } from './consts'
+import { CowSwapWidgetUrlParams } from './types'
+
+export function buildWidgetUrl(params: CowSwapWidgetUrlParams): string {
+  const host = COWSWAP_URLS[params.env ?? 'prod']
+  const path = buildWidgetPath(params)
+  const query = buildTradeAmountsQuery(params)
+
+  return host + '/#' + path + '?' + query
+}
+
+export function buildWidgetPath(params: CowSwapWidgetUrlParams): string {
+  const { chainId = DEFAULT_CHAIN, tradeAssets } = params
+
+  const assetsPath = tradeAssets
+    ? [tradeAssets.sell.asset, tradeAssets.buy.asset].map(encodeURIComponent).join('/')
+    : ''
+
+  return `/${chainId}/swap/widget/${assetsPath}`
+}
+
+export function buildTradeAmountsQuery(params: CowSwapWidgetUrlParams): URLSearchParams {
+  const { tradeAssets, theme } = params
+  const query = new URLSearchParams()
+
+  if (tradeAssets) {
+    const { sell, buy } = tradeAssets
+
+    if (sell.amount) {
+      query.append('sellAmount', sell.amount)
+    }
+
+    if (buy.amount) {
+      query.append('buyAmount', buy.amount)
+    }
+  }
+
+  if (theme) {
+    query.append('theme', theme)
+  }
+
+  return query
+}
diff --git a/src/libs/widget-lib/tsconfig.json b/src/libs/widget-lib/tsconfig.json
new file mode 100644
index 0000000000..8122543a9a
--- /dev/null
+++ b/src/libs/widget-lib/tsconfig.json
@@ -0,0 +1,22 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "compilerOptions": {
+    "module": "commonjs",
+    "forceConsistentCasingInFileNames": true,
+    "strict": true,
+    "noImplicitOverride": true,
+    "noPropertyAccessFromIndexSignature": true,
+    "noImplicitReturns": true,
+    "noFallthroughCasesInSwitch": true
+  },
+  "files": [],
+  "include": [],
+  "references": [
+    {
+      "path": "./tsconfig.lib.json"
+    },
+    {
+      "path": "./tsconfig.spec.json"
+    }
+  ]
+}
diff --git a/src/libs/widget-lib/tsconfig.lib.json b/src/libs/widget-lib/tsconfig.lib.json
new file mode 100644
index 0000000000..4befa7f099
--- /dev/null
+++ b/src/libs/widget-lib/tsconfig.lib.json
@@ -0,0 +1,10 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../../dist/out-tsc",
+    "declaration": true,
+    "types": ["node"]
+  },
+  "include": ["src/**/*.ts"],
+  "exclude": ["jest.config.ts", "src/**/*.spec.ts", "src/**/*.test.ts"]
+}
diff --git a/src/libs/widget-lib/tsconfig.spec.json b/src/libs/widget-lib/tsconfig.spec.json
new file mode 100644
index 0000000000..5a865ca8c0
--- /dev/null
+++ b/src/libs/widget-lib/tsconfig.spec.json
@@ -0,0 +1,9 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../../dist/out-tsc",
+    "module": "commonjs",
+    "types": ["jest", "node"]
+  },
+  "include": ["jest.config.ts", "src/**/*.test.ts", "src/**/*.spec.ts", "src/**/*.d.ts", "src/lib/widget.ts"]
+}
diff --git a/src/libs/widget-lib/vite.config.ts b/src/libs/widget-lib/vite.config.ts
new file mode 100644
index 0000000000..7155209003
--- /dev/null
+++ b/src/libs/widget-lib/vite.config.ts
@@ -0,0 +1,48 @@
+/// <reference types="vitest" />
+import { joinPathFragments } from '@nx/devkit'
+import { defineConfig } from 'vite'
+import dts from 'vite-plugin-dts'
+import viteTsConfigPaths from 'vite-tsconfig-paths'
+
+export default defineConfig({
+  cacheDir: '../../../node_modules/.vite/widget-lib',
+
+  plugins: [
+    dts({
+      entryRoot: 'src',
+      tsConfigFilePath: joinPathFragments(__dirname, 'tsconfig.lib.json'),
+      skipDiagnostics: true,
+    }),
+
+    viteTsConfigPaths({
+      root: '../../../',
+    }),
+  ],
+
+  // Uncomment this if you are using workers.
+  // worker: {
+  //  plugins: [
+  //    viteTsConfigPaths({
+  //      root: '../../../',
+  //    }),
+  //  ],
+  // },
+
+  // Configuration for building your library.
+  // See: https://vitejs.dev/guide/build.html#library-mode
+  build: {
+    lib: {
+      // Could also be a dictionary or array of multiple entry points.
+      entry: 'src/index.ts',
+      name: 'widget-lib',
+      fileName: 'index',
+      // Change this to the formats you want to support.
+      // Don't forgot to update your package.json as well.
+      formats: ['es', 'cjs'],
+    },
+    rollupOptions: {
+      // External packages that should not be bundled into your library.
+      external: [],
+    },
+  },
+})
diff --git a/tools/scripts/publish.mjs b/tools/scripts/publish.mjs
index e82a097be2..a6214556eb 100644
--- a/tools/scripts/publish.mjs
+++ b/tools/scripts/publish.mjs
@@ -7,11 +7,12 @@
  * You might need to authenticate with NPM before running this script.
  */
 
-import { execSync } from 'child_process'
-import { readFileSync, writeFileSync } from 'fs'
+import devkit from '@nx/devkit'
 import chalk from 'chalk'
 
-import devkit from '@nx/devkit'
+import { execSync } from 'child_process'
+import { readFileSync, writeFileSync } from 'fs'
+import path from 'path'
 const { readCachedProjectGraph } = devkit
 
 function invariant(condition, message) {
@@ -23,7 +24,7 @@ function invariant(condition, message) {
 
 // Executing publish script: node path/to/publish.mjs {name} --version {version} --tag {tag}
 // Default "tag" to "next" so we won't publish the "latest" tag by accident.
-const [, , name, version, tag = 'next'] = process.argv
+const [, , name, version, tag] = process.argv
 
 // A simple SemVer validation to validate the version
 const validVersion = /^\d+\.\d+\.\d+(-\w+\.\d+)?/
@@ -43,6 +44,9 @@ invariant(
   `Could not find "build.options.outputPath" of project "${name}". Is project.json configured  correctly?`
 )
 
+const rootLib = path.dirname(project.data.sourceRoot)
+const copyReadmeCommand = `cp ${rootLib}/README.md ${outputPath}`
+console.log(chalk.bold.greenBright(copyReadmeCommand))
 process.chdir(outputPath)
 
 // Updating the version in "package.json" before publishing
@@ -55,4 +59,7 @@ try {
 }
 
 // Execute "npm publish" to publish
-execSync(`npm publish --access public --tag ${tag}`)
+const publishCommand = `npm publish --access public --tag ${tag === 'undefined' ? 'next' : tag}`
+console.log(chalk.bold.greenBright(publishCommand))
+execSync(publishCommand)
+console.log('Published successfully 🎉')
diff --git a/tsconfig.base.json b/tsconfig.base.json
index e341874f5d..a8bde00a51 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -25,7 +25,8 @@
     "types": ["react-spring", "jest"],
     "paths": {
       "@cowprotocol/ui": ["libs/ui/src/index.ts"],
-      "@cowprotocol/ui-utils": ["libs/ui-utils/src/index.ts"]
+      "@cowprotocol/ui-utils": ["libs/ui-utils/src/index.ts"],
+      "@cowprotocol/widget-lib": ["src/libs/widget-lib/src/index.ts"]
     }
   },
   "exclude": ["node_modules", "cypress"]

From 6354c9ad8aa898b5c3b23797a6c1b96af26efc63 Mon Sep 17 00:00:00 2001
From: Alexandr Kazachenko <shoom3301@gmail.com>
Date: Thu, 22 Jun 2023 19:10:12 +0600
Subject: [PATCH 30/67] chore: update embedded widget codebase (#2707)

* chore: update embedded widget codebase

* ci: vite config for dev server

* chore: fix typings

* feat(injected-widget): support widget mode features

* Fix code style issues with Prettier

* refactor(injected-widget): simplify postMessage events data

---------

Co-authored-by: Lint Action <lint-action@samuelmeuli.com>
---
 package.json                                  |   1 +
 src/common/constants/routes.ts                |  65 ++++---
 .../containers/ImportTokenModal/index.tsx     |  21 +-
 .../updaters/ThemeFromUrlUpdater/index.tsx    |  34 ++++
 src/common/utils/isInjectedWidget.ts          |   3 +
 .../components/AmplitudeAnalytics/index.ts    |   4 +-
 src/legacy/components/Header/index.tsx        |  51 +++--
 src/legacy/components/Header/styled.tsx       |   4 +
 src/legacy/state/connection/reducer.ts        |  19 +-
 .../orders/middleware/appziMiddleware.test.ts |   2 +-
 src/libs/widget-lib/README.md                 |   4 +
 src/libs/widget-lib/project.json              |   9 +
 src/libs/widget-lib/src/consts.ts             |   7 +-
 src/libs/widget-lib/src/cowSwapWidget.ts      |  37 ++--
 src/libs/widget-lib/src/demo/ProviderMode.ts  |  29 +++
 src/libs/widget-lib/src/demo/Settings.ts      |  45 +++++
 src/libs/widget-lib/src/demo/index.html       | 184 ++++++++++++++++++
 src/libs/widget-lib/src/demo/index.ts         |  39 ++++
 src/libs/widget-lib/src/types.ts              |  29 +--
 src/libs/widget-lib/src/urlUtils.spec.ts      |  85 ++++++++
 .../widget-lib/src/{utils.ts => urlUtils.ts}  |   8 +-
 src/libs/widget-lib/src/utils.spec.ts         |  75 -------
 src/libs/widget-lib/vite.config.ts            |  94 +++++----
 .../application/containers/App/RoutesApp.tsx  |   7 +-
 .../application/containers/App/Updaters.tsx   |   4 +
 .../application/containers/App/index.tsx      |  14 +-
 .../application/containers/App/styled.ts      |   4 +
 .../hooks/useInjectedWidgetParams.ts          |   7 +
 src/modules/injectedWidget/index.ts           |   2 +
 .../state/injectedWidgetParamsAtom.ts         |   9 +
 .../updaters/InjectedWidgetUpdater.ts         |  28 +++
 src/modules/mainMenu/pure/MenuTree/index.tsx  |   4 +-
 src/modules/mainMenu/types.ts                 |   4 +-
 src/modules/mainMenu/utils.ts                 |   4 +-
 src/modules/trade/hooks/useTradeTypeInfo.ts   |   8 +-
 .../trade/utils/parameterizeTradeRoute.ts     |   4 +-
 src/modules/wallet/api/types.ts               |   1 +
 src/modules/wallet/api/utils/connection.ts    |   2 +
 .../wallet/web3-react/connection/index.tsx    |   5 +
 .../web3-react/connection/injectedWidget.tsx  |  19 ++
 .../Injected/IFrameEthereumProvider.ts        |  11 ++
 .../web3-react/connectors/Injected/index.tsx  |  25 ++-
 .../web3-react/hooks/useEagerlyConnect.ts     |  14 +-
 .../web3-react/hooks/useOrderedConnections.ts |   7 +
 yarn.lock                                     |   7 +
 45 files changed, 790 insertions(+), 249 deletions(-)
 create mode 100644 src/common/updaters/ThemeFromUrlUpdater/index.tsx
 create mode 100644 src/common/utils/isInjectedWidget.ts
 create mode 100644 src/libs/widget-lib/src/demo/ProviderMode.ts
 create mode 100644 src/libs/widget-lib/src/demo/Settings.ts
 create mode 100644 src/libs/widget-lib/src/demo/index.html
 create mode 100644 src/libs/widget-lib/src/demo/index.ts
 create mode 100644 src/libs/widget-lib/src/urlUtils.spec.ts
 rename src/libs/widget-lib/src/{utils.ts => urlUtils.ts} (81%)
 delete mode 100644 src/libs/widget-lib/src/utils.spec.ts
 create mode 100644 src/modules/injectedWidget/hooks/useInjectedWidgetParams.ts
 create mode 100644 src/modules/injectedWidget/index.ts
 create mode 100644 src/modules/injectedWidget/state/injectedWidgetParamsAtom.ts
 create mode 100644 src/modules/injectedWidget/updaters/InjectedWidgetUpdater.ts
 create mode 100644 src/modules/wallet/web3-react/connection/injectedWidget.tsx
 create mode 100644 src/modules/wallet/web3-react/connectors/Injected/IFrameEthereumProvider.ts

diff --git a/package.json b/package.json
index bc6658fa58..dc439aba80 100644
--- a/package.json
+++ b/package.json
@@ -81,6 +81,7 @@
     "@cowprotocol/ethflowcontract": "cowprotocol/ethflowcontract.git#v1.0.0-artifacts",
     "@davatar/react": "1.8.1",
     "@ethersproject/bignumber": "^5.7.0",
+    "@ethvault/iframe-provider": "^0.1.10",
     "@fontsource/ibm-plex-mono": "^4.5.1",
     "@fontsource/inter": "^4.5.1",
     "@ledgerhq/connect-kit-loader": "^1.0.2",
diff --git a/src/common/constants/routes.ts b/src/common/constants/routes.ts
index 058f7d386d..0054846fa3 100644
--- a/src/common/constants/routes.ts
+++ b/src/common/constants/routes.ts
@@ -1,30 +1,35 @@
-// ENUM with routes
-export enum Routes {
-  HOME = '/',
-  SWAP = '/:chainId?/swap/:inputCurrencyId?/:outputCurrencyId?',
-  LIMIT_ORDER = '/:chainId?/limit-orders/:inputCurrencyId?/:outputCurrencyId?',
-  ADVANCED_ORDERS = '/:chainId?/advanced-orders/:inputCurrencyId?/:outputCurrencyId?',
-  SEND = '/send',
-  ACCOUNT = '/account',
-  ACCOUNT_TOKENS = '/account/tokens',
-  ACCOUNT_TOKENS_SINGLE = '/account/tokens/:address',
-  ACCOUNT_GOVERNANCE = '/account/governance',
-  ABOUT = '/about',
-  PRIVACY_POLICY = '/privacy-policy',
-  COOKIE_POLICY = '/cookie-policy',
-  TERMS_CONDITIONS = '/terms-and-conditions',
-  FAQ = '/faq',
-  FAQ_PROTOCOL = '/faq/protocol',
-  FAQ_TOKEN = '/faq/token',
-  FAQ_TRADING = '/faq/trading',
-  FAQ_LIMIT_ORDERS = '/faq/limit-order',
-  FAQ_ETH_FLOW = '/faq/sell-native',
-  PLAY_COWRUNNER = '/play/cow-runner',
-  PLAY_MEVSLICER = '/play/mev-slicer',
-  ANYSWAP_AFFECTED = '/anyswap-affected-users',
-  CHAT = '/chat',
-  DOCS = '/docs',
-  STATS = '/stats',
-  TWITTER = '/twitter',
-  KITCHEN_SINK = '/kitchen-sink',
-}
+import { isInjectedWidget } from 'common/utils/isInjectedWidget'
+
+export const TRADE_WIDGET_PREFIX = isInjectedWidget() ? '/widget' : ''
+
+export const Routes = {
+  HOME: '/',
+  SWAP: `/:chainId?${TRADE_WIDGET_PREFIX}/swap/:inputCurrencyId?/:outputCurrencyId?`,
+  LIMIT_ORDER: `/:chainId?${TRADE_WIDGET_PREFIX}/limit-orders/:inputCurrencyId?/:outputCurrencyId?`,
+  ADVANCED_ORDERS: `/:chainId?${TRADE_WIDGET_PREFIX}/advanced-orders/:inputCurrencyId?/:outputCurrencyId?`,
+  SEND: '/send',
+  ACCOUNT: '/account',
+  ACCOUNT_TOKENS: '/account/tokens',
+  ACCOUNT_TOKENS_SINGLE: '/account/tokens/:address',
+  ACCOUNT_GOVERNANCE: '/account/governance',
+  ABOUT: '/about',
+  PRIVACY_POLICY: '/privacy-policy',
+  COOKIE_POLICY: '/cookie-policy',
+  TERMS_CONDITIONS: '/terms-and-conditions',
+  FAQ: '/faq',
+  FAQ_PROTOCOL: '/faq/protocol',
+  FAQ_TOKEN: '/faq/token',
+  FAQ_TRADING: '/faq/trading',
+  FAQ_LIMIT_ORDERS: '/faq/limit-order',
+  FAQ_ETH_FLOW: '/faq/sell-native',
+  PLAY_COWRUNNER: '/play/cow-runner',
+  PLAY_MEVSLICER: '/play/mev-slicer',
+  ANYSWAP_AFFECTED: '/anyswap-affected-users',
+  CHAT: '/chat',
+  DOCS: '/docs',
+  STATS: '/stats',
+  TWITTER: '/twitter',
+} as const
+
+export type RoutesKeys = keyof typeof Routes
+export type RoutesValues = (typeof Routes)[RoutesKeys]
diff --git a/src/common/containers/ImportTokenModal/index.tsx b/src/common/containers/ImportTokenModal/index.tsx
index d84006a5a0..281043da7b 100644
--- a/src/common/containers/ImportTokenModal/index.tsx
+++ b/src/common/containers/ImportTokenModal/index.tsx
@@ -6,13 +6,17 @@ import { Token } from '@uniswap/sdk-core'
 import TokenWarningModal from 'legacy/components/TokenWarningModal'
 import { TOKEN_SHORTHANDS, WRAPPED_NATIVE_CURRENCY } from 'legacy/constants/tokens'
 import { useSearchInactiveTokenLists } from 'legacy/hooks/Tokens'
+import useDebounce from 'legacy/hooks/useDebounce'
 import { Field } from 'legacy/state/swap/actions'
+import { useAddUserToken } from 'legacy/state/user/hooks'
 import { supportedChainId } from 'legacy/utils/supportedChainId'
 
 import { tokensByAddressAtom, tokensBySymbolAtom } from 'modules/tokensList/state/tokensListAtom'
 import { useNavigateOnCurrencySelection } from 'modules/trade/hooks/useNavigateOnCurrencySelection'
 import { useTradeState } from 'modules/trade/hooks/useTradeState'
 
+import { isInjectedWidget } from 'common/utils/isInjectedWidget'
+
 export interface ImportTokenModalProps {
   chainId: number
 }
@@ -21,6 +25,8 @@ export function ImportTokenModal(props: ImportTokenModalProps) {
   const { chainId } = props
 
   const { state } = useTradeState()
+  const addToken = useAddUserToken()
+
   const loadedInputCurrency = useSearchInactiveTokenLists(
     state?.inputCurrencyId || undefined,
     1,
@@ -38,14 +44,15 @@ export function ImportTokenModal(props: ImportTokenModalProps) {
 
   const urlLoadedTokens: Token[] = useMemo(
     () => [loadedInputCurrency, loadedOutputCurrency]?.filter((c): c is Token => c?.isToken ?? false) ?? [],
-    [loadedInputCurrency, loadedOutputCurrency]
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [loadedInputCurrency?.address, loadedOutputCurrency?.address]
   )
 
   // dismiss warning if all imported tokens are in active lists
   const tokensByAddress = useAtomValue(tokensByAddressAtom)
   const tokensBySymbol = useAtomValue(tokensBySymbolAtom)
   // example: https://cowswap.dev.gnosisdev.com/#/swap?chain=mainnet&inputCurrency=0xe0b7927c4af23765cb51314a0e0521a9645f0e2a&outputCurrency=0x539F3615C1dBAfa0D008d87504667458acBd16Fa
-  const importTokensNotInDefault = useMemo(() => {
+  const _importTokensNotInDefault = useMemo(() => {
     // We should return an empty array until the defaultTokens are loaded
     // Otherwise WETH will be in urlLoadedTokens but defaultTokens will be empty
     // Fix for https://github.com/cowprotocol/cowswap/issues/534
@@ -77,6 +84,7 @@ export function ImportTokenModal(props: ImportTokenModalProps) {
         })
     )
   }, [chainId, tokensByAddress, tokensBySymbol, urlLoadedTokens])
+  const importTokensNotInDefault = useDebounce(_importTokensNotInDefault, 200)
 
   const [dismissTokenWarning, setDismissTokenWarning] = useState<boolean>(false)
 
@@ -109,6 +117,15 @@ export function ImportTokenModal(props: ImportTokenModalProps) {
     }
   }, [importTokensLength])
 
+  // Automatically import unknown tokens in Widget mode
+  useEffect(() => {
+    if (isInjectedWidget()) {
+      importTokensNotInDefault.forEach(addToken)
+    }
+  }, [addToken, importTokensNotInDefault])
+
+  if (isInjectedWidget()) return null
+
   return (
     <TokenWarningModal
       isOpen={importTokensNotInDefault.length > 0 && !dismissTokenWarning}
diff --git a/src/common/updaters/ThemeFromUrlUpdater/index.tsx b/src/common/updaters/ThemeFromUrlUpdater/index.tsx
new file mode 100644
index 0000000000..683db0e494
--- /dev/null
+++ b/src/common/updaters/ThemeFromUrlUpdater/index.tsx
@@ -0,0 +1,34 @@
+import { useEffect, useRef } from 'react'
+
+import { useLocation } from 'react-router-dom'
+
+import { useAppDispatch } from 'legacy/state/hooks'
+import { useIsDarkMode } from 'legacy/state/user/hooks'
+import { updateUserDarkMode } from 'legacy/state/user/reducer'
+
+/**
+ * Switch theme depending on theme query parameter
+ */
+export function ThemeFromUrlUpdater() {
+  const darkMode = useIsDarkMode()
+  const darkModeRef = useRef(darkMode)
+  const dispatch = useAppDispatch()
+  const { search } = useLocation()
+
+  darkModeRef.current = darkMode
+
+  useEffect(() => {
+    const searchParams = new URLSearchParams(search)
+    const themeValue = searchParams.get('theme')
+
+    if (!themeValue) return
+
+    const isDarkMode = searchParams.get('theme') === 'dark'
+
+    if (isDarkMode === darkModeRef.current) return
+
+    dispatch(updateUserDarkMode({ userDarkMode: isDarkMode }))
+  }, [search, dispatch])
+
+  return null
+}
diff --git a/src/common/utils/isInjectedWidget.ts b/src/common/utils/isInjectedWidget.ts
new file mode 100644
index 0000000000..8f17ad96a8
--- /dev/null
+++ b/src/common/utils/isInjectedWidget.ts
@@ -0,0 +1,3 @@
+export function isInjectedWidget(): boolean {
+  return window.location.hash.includes('/widget')
+}
diff --git a/src/legacy/components/AmplitudeAnalytics/index.ts b/src/legacy/components/AmplitudeAnalytics/index.ts
index f056e58a21..d6533cc94d 100644
--- a/src/legacy/components/AmplitudeAnalytics/index.ts
+++ b/src/legacy/components/AmplitudeAnalytics/index.ts
@@ -7,9 +7,9 @@ import { Identify, identify, init, track } from '@amplitude/analytics-browser'
  * member of the organization on Amplitude to view details.
  */
 export function initializeAnalytics(isDevEnvironment = process.env.NODE_ENV === 'development') {
-  const API_KEY = process.env.REACT_APP_AMPLITUDE_KEY
-  if (isDevEnvironment || !API_KEY) return
+  if (isDevEnvironment) return
 
+  const API_KEY = process.env.REACT_APP_AMPLITUDE_KEY
   if (typeof API_KEY === 'undefined') {
     throw new Error(`REACT_APP_AMPLITUDE_KEY must be a defined environment variable`)
   }
diff --git a/src/legacy/components/Header/index.tsx b/src/legacy/components/Header/index.tsx
index 8e08f4c30f..ac252c6d11 100644
--- a/src/legacy/components/Header/index.tsx
+++ b/src/legacy/components/Header/index.tsx
@@ -15,6 +15,7 @@ import { supportedChainId } from 'legacy/utils/supportedChainId'
 import { addBodyClass, removeBodyClass } from 'legacy/utils/toggleBodyClass'
 
 import { OrdersPanel } from 'modules/account/containers/OrdersPanel'
+import { useInjectedWidgetParams } from 'modules/injectedWidget'
 import { MainMenuContext, useMenuItems } from 'modules/mainMenu'
 import { MenuTree } from 'modules/mainMenu/pure/MenuTree'
 import { useSwapRawState } from 'modules/swap/hooks/useSwapRawState'
@@ -25,11 +26,13 @@ import { useWalletInfo, Web3Status } from 'modules/wallet'
 
 import { Routes } from 'common/constants/routes'
 import { TokenAmount } from 'common/pure/TokenAmount'
+import { isInjectedWidget } from 'common/utils/isInjectedWidget'
 
 import MobileMenuIcon from './MobileMenuIcon'
 import {
   AccountElement,
   BalanceText,
+  CustomLogoImg,
   HeaderControls,
   HeaderElement,
   HeaderModWrapper,
@@ -49,6 +52,8 @@ const CHAIN_CURRENCY_LABELS: { [chainId in ChainId]?: string } = {
 export default function Header() {
   const { account, chainId: connectedChainId } = useWalletInfo()
   const chainId = supportedChainId(connectedChainId)
+  const isInjectedWidgetMode = isInjectedWidget()
+  const injectedWidgetParams = useInjectedWidgetParams()
 
   const userEthBalance = useNativeCurrencyBalances(account ? [account] : [])?.[account ?? '']
   const nativeToken = chainId && (CHAIN_CURRENCY_LABELS[chainId] || 'ETH')
@@ -72,7 +77,7 @@ export default function Header() {
   const menuItems = useMenuItems()
 
   const navigate = useNavigate()
-  const handleBalanceButtonClick = () => navigate('/account')
+
   const isUpToLarge = useMediaQuery(upToLarge)
   const isUpToMedium = useMediaQuery(upToMedium)
   const isUpToSmall = useMediaQuery(upToSmall)
@@ -122,26 +127,36 @@ export default function Header() {
     <Wrapper isMobileMenuOpen={isMobileMenuOpen}>
       <HeaderModWrapper>
         <HeaderRow>
-          <Title href={Routes.HOME} isMobileMenuOpen={isMobileMenuOpen}>
-            <UniIcon>
-              <LogoImage isMobileMenuOpen={isMobileMenuOpen}>
-                <SVG src={cowSwapLogo(darkMode)} />
-              </LogoImage>
-            </UniIcon>
-          </Title>
-          <MenuTree items={menuItems} isMobileMenuOpen={isMobileMenuOpen} context={menuContext} />
+          {!injectedWidgetParams.hideLogo && (
+            <Title href={isInjectedWidgetMode ? undefined : Routes.HOME} isMobileMenuOpen={isMobileMenuOpen}>
+              <UniIcon>
+                <LogoImage isMobileMenuOpen={isMobileMenuOpen}>
+                  {injectedWidgetParams.logoUrl ? (
+                    <CustomLogoImg src={injectedWidgetParams.logoUrl} alt="Logo" />
+                  ) : (
+                    <SVG src={cowSwapLogo(darkMode)} />
+                  )}
+                </LogoImage>
+              </UniIcon>
+            </Title>
+          )}
+          {!isInjectedWidgetMode && (
+            <MenuTree items={menuItems} isMobileMenuOpen={isMobileMenuOpen} context={menuContext} />
+          )}
         </HeaderRow>
 
         <HeaderControls>
-          <NetworkSelector />
+          {!injectedWidgetParams.hideNetworkSelector && <NetworkSelector />}
 
           <HeaderElement>
-            <CowBalanceButton
-              onClick={handleBalanceButtonClick}
-              account={account}
-              chainId={chainId}
-              isUpToSmall={isUpToSmall}
-            />
+            {!isInjectedWidgetMode && (
+              <CowBalanceButton
+                onClick={() => navigate('/account')}
+                account={account}
+                chainId={chainId}
+                isUpToSmall={isUpToSmall}
+              />
+            )}
 
             <AccountElement active={!!account} onClick={handleOpenOrdersPanel}>
               {account && userEthBalance && chainId && (
@@ -154,7 +169,9 @@ export default function Header() {
           </HeaderElement>
         </HeaderControls>
 
-        {isUpToLarge && <MobileMenuIcon isMobileMenuOpen={isMobileMenuOpen} onClick={handleMobileMenuOnClick} />}
+        {isUpToLarge && !isInjectedWidgetMode && (
+          <MobileMenuIcon isMobileMenuOpen={isMobileMenuOpen} onClick={handleMobileMenuOnClick} />
+        )}
         {isOrdersPanelOpen && <OrdersPanel handleCloseOrdersPanel={handleCloseOrdersPanel} />}
       </HeaderModWrapper>
     </Wrapper>
diff --git a/src/legacy/components/Header/styled.tsx b/src/legacy/components/Header/styled.tsx
index 12babdf391..722d706963 100644
--- a/src/legacy/components/Header/styled.tsx
+++ b/src/legacy/components/Header/styled.tsx
@@ -493,6 +493,10 @@ export const UniIcon = styled.div`
   }
 `
 
+export const CustomLogoImg = styled.img`
+  height: 100%;
+`
+
 export const AccountElement = styled(AccountElementUni)<{ active: boolean }>`
   background-color: ${({ theme, active }) => (!active ? theme.bg1 : theme.bg1)};
   border-radius: 21px;
diff --git a/src/legacy/state/connection/reducer.ts b/src/legacy/state/connection/reducer.ts
index 2db6d658bb..14ae1b7651 100644
--- a/src/legacy/state/connection/reducer.ts
+++ b/src/legacy/state/connection/reducer.ts
@@ -7,21 +7,10 @@ export interface ConnectionState {
 }
 
 export const initialState: ConnectionState = {
-  errorByConnectionType: {
-    [ConnectionType.INJECTED]: undefined,
-    [ConnectionType.FORTMATIC]: undefined,
-    [ConnectionType.WALLET_CONNECT]: undefined,
-    [ConnectionType.COINBASE_WALLET]: undefined,
-    [ConnectionType.NETWORK]: undefined,
-    [ConnectionType.GNOSIS_SAFE]: undefined,
-    [ConnectionType.ZENGO]: undefined,
-    [ConnectionType.AMBIRE]: undefined,
-    [ConnectionType.ALPHA]: undefined,
-    [ConnectionType.TALLY]: undefined,
-    [ConnectionType.TRUST]: undefined,
-    [ConnectionType.LEDGER]: undefined,
-    [ConnectionType.KEYSTONE]: undefined,
-  },
+  errorByConnectionType: Object.keys(ConnectionType).reduce((acc, key) => {
+    acc[key as ConnectionType] = undefined
+    return acc
+  }, {} as Record<ConnectionType, undefined>),
 }
 
 const connectionSlice = createSlice({
diff --git a/src/legacy/state/orders/middleware/appziMiddleware.test.ts b/src/legacy/state/orders/middleware/appziMiddleware.test.ts
index aca3231a30..d7cee50434 100644
--- a/src/legacy/state/orders/middleware/appziMiddleware.test.ts
+++ b/src/legacy/state/orders/middleware/appziMiddleware.test.ts
@@ -1,4 +1,5 @@
 import { OrderClass } from '@cowprotocol/cow-sdk'
+import { getOrderByIdFromState } from '../helpers'
 
 import { AnyAction, Dispatch, MiddlewareAPI } from 'redux'
 import { instance, mock, resetCalls, when } from 'ts-mockito'
@@ -8,7 +9,6 @@ import { isOrderInPendingTooLong, openNpsAppziSometimes } from 'legacy/utils/app
 import { appziMiddleware } from './appziMiddleware'
 
 import { AppState } from '../../index'
-import { getOrderByIdFromState } from '../helpers'
 
 jest.mock('legacy/utils/appzi')
 jest.mock('../helpers', () => {
diff --git a/src/libs/widget-lib/README.md b/src/libs/widget-lib/README.md
index 521a7982f5..46b1e77b69 100644
--- a/src/libs/widget-lib/README.md
+++ b/src/libs/widget-lib/README.md
@@ -47,6 +47,10 @@ cowSwapWidget({
 ## Developers
 
 ```bash
+# Run demo project locally
+# Will open http://localhost:3012/src/demo/index.html
+nx serve widget-lib
+
 # Test
 nx test widget-lib
 
diff --git a/src/libs/widget-lib/project.json b/src/libs/widget-lib/project.json
index cbc42d9833..97fa6d0ad2 100644
--- a/src/libs/widget-lib/project.json
+++ b/src/libs/widget-lib/project.json
@@ -12,6 +12,15 @@
         "outputPath": "dist/libs/widget-lib"
       }
     },
+    "serve": {
+      "executor": "@nx/vite:dev-server",
+      "defaultConfiguration": "development",
+      "options": {
+        "buildTarget": "widget-lib:build",
+        "port": 3012
+      },
+      "configurations": {}
+    },
     "publish": {
       "command": "node tools/scripts/publish.mjs widget-lib {args.ver} {args.tag}",
       "dependsOn": ["build"]
diff --git a/src/libs/widget-lib/src/consts.ts b/src/libs/widget-lib/src/consts.ts
index a1464e3e38..3789bc0713 100644
--- a/src/libs/widget-lib/src/consts.ts
+++ b/src/libs/widget-lib/src/consts.ts
@@ -1,11 +1,6 @@
 import { CowSwapWidgetEnv } from './types'
 
-export const DEFAULT_CHAIN = 1
-export const DEFAULT_WIDTH = 400
-export const DEFAULT_HEIGHT = 640
-
 export const COWSWAP_URLS: Record<CowSwapWidgetEnv, string> = {
   local: 'http://localhost:3000',
-  barn: 'https://barn.cow.fi',
-  prod: 'http://swap.cow.fi',
+  prod: 'https://swap.cow.fi',
 }
diff --git a/src/libs/widget-lib/src/cowSwapWidget.ts b/src/libs/widget-lib/src/cowSwapWidget.ts
index bb003f93e9..301a47461f 100644
--- a/src/libs/widget-lib/src/cowSwapWidget.ts
+++ b/src/libs/widget-lib/src/cowSwapWidget.ts
@@ -1,15 +1,14 @@
-import { DEFAULT_HEIGHT, DEFAULT_WIDTH } from './consts'
 import { JsonRpcManager } from './JsonRpcManager'
-import { CowSwapWidgetParams, CowSwapWidgetUrlParams } from './types'
-import { buildTradeAmountsQuery, buildWidgetPath, buildWidgetUrl } from './utils'
+import { CowSwapWidgetParams, CowSwapWidgetSettings } from './types'
+import { buildTradeAmountsQuery, buildWidgetPath, buildWidgetUrl } from './urlUtils'
 
-const COW_SWAP_WIDGET_KEY = '@cowprotocol/widget-lib'
+const COW_SWAP_WIDGET_EVENT_KEY = 'cowSwapWidget'
 
-type UpdateWidgetCallback = (params: CowSwapWidgetUrlParams) => void
+export type UpdateWidgetCallback = (params: CowSwapWidgetSettings) => void
 
-export function cowSwapWidget(params: CowSwapWidgetParams): UpdateWidgetCallback {
+export function cowSwapWidget(params: CowSwapWidgetParams, settings: CowSwapWidgetSettings): UpdateWidgetCallback {
   const { container, provider } = params
-  const iframe = createIframe(params)
+  const iframe = createIframe(params, settings)
 
   container.innerHTML = ''
   container.appendChild(iframe)
@@ -24,29 +23,33 @@ export function cowSwapWidget(params: CowSwapWidgetParams): UpdateWidgetCallback
     jsonRpcManager.onConnect(provider)
   }
 
-  return (params: CowSwapWidgetUrlParams) => updateWidget(params, contentWindow)
+  return (params: CowSwapWidgetSettings) => updateWidget(params, contentWindow)
 }
 
-function updateWidget(params: CowSwapWidgetUrlParams, contentWindow: Window) {
-  const pathname = buildWidgetPath(params)
-  const search = buildTradeAmountsQuery(params).toString()
+function updateWidget(params: CowSwapWidgetSettings, contentWindow: Window) {
+  const pathname = buildWidgetPath(params.urlParams)
+  const search = buildTradeAmountsQuery(params.urlParams).toString()
 
   contentWindow.postMessage(
     {
-      key: COW_SWAP_WIDGET_KEY,
-      pathname,
-      search,
+      key: COW_SWAP_WIDGET_EVENT_KEY,
+      method: 'update',
+      urlParams: {
+        pathname,
+        search,
+      },
+      appParams: params.appParams,
     },
     '*'
   )
 }
 
-function createIframe(params: CowSwapWidgetParams): HTMLIFrameElement {
-  const { width = DEFAULT_WIDTH, height = DEFAULT_HEIGHT } = params
+function createIframe(params: CowSwapWidgetParams, settings: CowSwapWidgetSettings): HTMLIFrameElement {
+  const { width, height } = params
 
   const iframe = document.createElement('iframe')
 
-  iframe.src = buildWidgetUrl(params.urlParams ?? {})
+  iframe.src = buildWidgetUrl(settings.urlParams)
   iframe.width = `${width}px`
   iframe.height = `${height}px`
   iframe.style.border = '0'
diff --git a/src/libs/widget-lib/src/demo/ProviderMode.ts b/src/libs/widget-lib/src/demo/ProviderMode.ts
new file mode 100644
index 0000000000..d64d76caa4
--- /dev/null
+++ b/src/libs/widget-lib/src/demo/ProviderMode.ts
@@ -0,0 +1,29 @@
+import { EthereumProvider } from '../types'
+
+export function ProviderMode(init: (ethereum?: EthereumProvider) => void) {
+  const injectedProvider = (window as any)['ethereum'] as EthereumProvider
+
+  const connectedProviderButton = document.getElementById('connectedProviderButton') as HTMLButtonElement
+  const standaloneModeButton = document.getElementById('standaloneModeButton') as HTMLButtonElement
+  const toggleMode = () => {
+    connectedProviderButton.classList.toggle('active')
+    standaloneModeButton.classList.toggle('active')
+  }
+
+  connectedProviderButton.addEventListener('click', () => {
+    init(injectedProvider)
+    toggleMode()
+  })
+
+  standaloneModeButton.addEventListener('click', () => {
+    init()
+    toggleMode()
+  })
+
+  if (!injectedProvider) {
+    toggleMode()
+    connectedProviderButton.style.display = 'none'
+  } else {
+    init(injectedProvider)
+  }
+}
diff --git a/src/libs/widget-lib/src/demo/Settings.ts b/src/libs/widget-lib/src/demo/Settings.ts
new file mode 100644
index 0000000000..486c1d5793
--- /dev/null
+++ b/src/libs/widget-lib/src/demo/Settings.ts
@@ -0,0 +1,45 @@
+import { UpdateWidgetCallback } from '../cowSwapWidget'
+
+// eslint-disable-next-line max-lines-per-function
+export function Settings(updateWidget: UpdateWidgetCallback) {
+  const appSettingsForm = document.getElementById('appSettingsForm') as HTMLFormElement
+  const tradeSettingsForm = document.getElementById('tradeSettingsForm') as HTMLFormElement
+
+  function applySettings() {
+    const tradeSettingsState = Object.fromEntries(new FormData(tradeSettingsForm) as never)
+    const appSettingsState = Object.fromEntries(new FormData(appSettingsForm) as never)
+
+    updateWidget({
+      urlParams: {
+        env: tradeSettingsState['env'],
+        chainId: tradeSettingsState['chainId'],
+        theme: tradeSettingsState['theme'],
+        tradeType: tradeSettingsState['tradeType'],
+        tradeAssets: {
+          sell: {
+            asset: tradeSettingsState['tradeAssets.sell.asset'],
+            amount: tradeSettingsState['tradeAssets.sell.amount'],
+          },
+          buy: {
+            asset: tradeSettingsState['tradeAssets.buy.asset'],
+            amount: tradeSettingsState['tradeAssets.buy.amount'],
+          },
+        },
+      },
+      appParams: {
+        logoUrl: appSettingsState['logoUrl'],
+        hideLogo: appSettingsState['hideLogo'],
+        hideNetworkSelector: appSettingsState['hideNetworkSelector'],
+      },
+    })
+  }
+
+  ;['submit', 'change'].forEach((eventName) => {
+    ;[tradeSettingsForm, appSettingsForm].forEach((form) => {
+      form.addEventListener(eventName, (event) => {
+        event.preventDefault()
+        applySettings()
+      })
+    })
+  })
+}
diff --git a/src/libs/widget-lib/src/demo/index.html b/src/libs/widget-lib/src/demo/index.html
new file mode 100644
index 0000000000..f239e0b9ef
--- /dev/null
+++ b/src/libs/widget-lib/src/demo/index.html
@@ -0,0 +1,184 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <title>CowSwap Widget</title>
+    <script type="module">
+      import './index.ts'
+    </script>
+
+    <style>
+      body {
+        min-height: 100vh;
+        margin: 0;
+        background: rgb(5, 43, 101);
+        font-family: sans-serif;
+      }
+
+      #demoPage {
+        display: grid;
+        grid-template-columns: 300px 1fr 300px;
+        max-width: 1000px;
+        margin: 0 auto;
+      }
+
+      #widgetContainer {
+        margin: 30px;
+      }
+
+      #widgetContainer > iframe {
+        border: 1px solid #fff;
+        border-radius: 8px;
+        overflow: hidden;
+        background: rgba(83, 196, 239, 0.6);
+        box-shadow: 1px 10px 47px 0 rgba(83, 196, 239, 0.6);
+      }
+
+      #tradeSettings,
+      #tradeSettings input,
+      #tradeSettings select {
+        text-align: right;
+      }
+
+      .settingsContainer {
+        color: #fff;
+        margin-top: 30px;
+      }
+
+      .settingsForm > label {
+        display: block;
+        margin-bottom: 15px;
+      }
+
+      .settingsForm > label > span {
+        display: block;
+        margin-bottom: 2px;
+      }
+
+      .settingsForm input,
+      .settingsForm select {
+        border: 0;
+        padding: 6px 0 4px 8px;
+        border-right: 8px solid transparent;
+        background: #ffffff36;
+        color: #fff;
+        border-radius: 4px;
+        outline: none;
+      }
+
+      .settingsForm input:focus,
+      .settingsForm select:focus {
+        outline: 1px solid rgba(255, 255, 255, 0.51);
+      }
+
+      .actionButton,
+      #mainMenu > button.active {
+        background: rgb(202, 233, 255);
+        color: rgb(5, 43, 101);
+        border-radius: 8px;
+        padding: 8px 20px;
+        outline: none;
+        border: 0;
+        cursor: pointer;
+        font-size: 16px;
+        font-weight: bold;
+      }
+
+      #mainMenu {
+        max-width: 1000px;
+        text-align: center;
+        margin: 30px auto 0;
+        padding-left: 60px;
+      }
+
+      #mainMenu > button:not(.active) {
+        background: transparent;
+        color: rgb(202, 233, 255);
+        text-decoration: underline;
+      }
+    </style>
+  </head>
+  <body>
+    <div id="mainMenu">
+      <button id="connectedProviderButton" class="actionButton active">Connected to provider</button>
+      <button id="standaloneModeButton" class="actionButton">Standalone mode</button>
+    </div>
+    <div id="demoPage">
+      <div class="settingsContainer" id="tradeSettings">
+        <h3>CowSwap widget</h3>
+        <form class="settingsForm" id="tradeSettingsForm">
+          <label>
+            <span>Network</span>
+            <select name="chainId">
+              <option value="1" selected="selected">Ethereum</option>
+              <option value="100">Gnosis chain</option>
+              <option value="5">Goerli</option>
+            </select>
+          </label>
+          <label>
+            <span>Environment</span>
+            <select name="env">
+              <option value="local" selected="selected">Local</option>
+              <option value="prod">Prod</option>
+            </select>
+          </label>
+          <label>
+            <span>Trade type</span>
+            <select name="tradeType">
+              <option value="swap" selected="selected">Swap</option>
+              <option value="limit-orders">Limit orders</option>
+              <option value="advanced-orders">Advanced orders</option>
+            </select>
+          </label>
+          <label>
+            <span>Sell currency</span>
+            <input name="tradeAssets.sell.asset" type="text" value="COW" />
+          </label>
+          <label>
+            <span>Sell amount</span>
+            <input name="tradeAssets.sell.amount" type="text" value="1200" />
+          </label>
+          <label>
+            <span>Buy currency</span>
+            <input name="tradeAssets.buy.asset" type="text" value="WETH" />
+          </label>
+          <label>
+            <span>Buy amount</span>
+            <input name="tradeAssets.buy.amount" type="text" value="" />
+          </label>
+          <label>
+            <span>Theme</span>
+            <select name="theme">
+              <option value="light" selected="selected">Light</option>
+              <option value="dark">Dark</option>
+            </select>
+          </label>
+          <button class="actionButton">Update</button>
+        </form>
+      </div>
+      <div id="widgetContainer"></div>
+      <div class="settingsContainer">
+        <br /><br /><br />
+        <form class="settingsForm" id="appSettingsForm">
+          <label>
+            <span>Custom logo url</span>
+            <input
+              name="logoUrl"
+              type="text"
+              value="https://www.google.com/images/branding/googlelogo/2x/googlelogo_color_92x30dp.png"
+            />
+          </label>
+          <label>
+            <span>Hide logo</span>
+            <input name="hideLogo" type="checkbox" />
+          </label>
+          <label>
+            <span>Hide network selector</span>
+            <input name="hideNetworkSelector" type="checkbox" />
+          </label>
+          <button class="actionButton">Update</button>
+        </form>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/src/libs/widget-lib/src/demo/index.ts b/src/libs/widget-lib/src/demo/index.ts
new file mode 100644
index 0000000000..63c6697953
--- /dev/null
+++ b/src/libs/widget-lib/src/demo/index.ts
@@ -0,0 +1,39 @@
+import { ProviderMode } from './ProviderMode'
+import { Settings } from './Settings'
+
+import { cowSwapWidget, CowSwapWidgetAppParams, CowSwapWidgetUrlParams, EthereumProvider } from '../index'
+
+const urlParams: CowSwapWidgetUrlParams = {
+  env: 'local',
+  chainId: 1,
+  theme: 'light',
+  tradeType: 'swap',
+  tradeAssets: {
+    sell: {
+      // asset: '0x543ff227f64aa17ea132bf9886cab5db55dcaddf',
+      asset: 'COW',
+      amount: '1200',
+    },
+    buy: {
+      asset: 'WETH',
+    },
+  },
+}
+
+const appParams: CowSwapWidgetAppParams = {}
+
+function init(provider?: EthereumProvider) {
+  const updateWidget = cowSwapWidget(
+    {
+      width: 400,
+      height: 640,
+      container: document.getElementById('widgetContainer') as HTMLElement,
+      provider,
+    },
+    { urlParams, appParams }
+  )
+
+  Settings(updateWidget)
+}
+
+ProviderMode(init)
diff --git a/src/libs/widget-lib/src/types.ts b/src/libs/widget-lib/src/types.ts
index d0484fb97f..10f6257dcd 100644
--- a/src/libs/widget-lib/src/types.ts
+++ b/src/libs/widget-lib/src/types.ts
@@ -1,9 +1,3 @@
-declare global {
-  interface Window {
-    ethereum?: EthereumProvider
-  }
-}
-
 export interface JsonRpcRequest {
   id: number
   method: string
@@ -17,7 +11,7 @@ export interface EthereumProvider {
   enable(): Promise<void>
 }
 
-export type CowSwapWidgetEnv = 'local' | 'prod' | 'barn'
+export type CowSwapWidgetEnv = 'local' | 'prod'
 
 export type CowSwapTheme = 'dark' | 'light'
 
@@ -32,16 +26,27 @@ export interface TradeAssets {
 }
 
 export interface CowSwapWidgetUrlParams {
-  chainId?: number
-  env?: CowSwapWidgetEnv
+  chainId: number
+  tradeType: string
+  env: CowSwapWidgetEnv
   tradeAssets?: TradeAssets
   theme?: CowSwapTheme
 }
 
+export interface CowSwapWidgetAppParams {
+  logoUrl?: string
+  hideLogo?: boolean
+  hideNetworkSelector?: boolean
+}
+
+export interface CowSwapWidgetSettings {
+  urlParams: CowSwapWidgetUrlParams
+  appParams: CowSwapWidgetAppParams
+}
+
 export interface CowSwapWidgetParams {
+  width: number
+  height: number
   container: HTMLElement
-  width?: number
-  height?: number
-  urlParams?: CowSwapWidgetUrlParams
   provider?: EthereumProvider
 }
diff --git a/src/libs/widget-lib/src/urlUtils.spec.ts b/src/libs/widget-lib/src/urlUtils.spec.ts
new file mode 100644
index 0000000000..66fab5bf29
--- /dev/null
+++ b/src/libs/widget-lib/src/urlUtils.spec.ts
@@ -0,0 +1,85 @@
+import { buildWidgetUrl } from './urlUtils'
+
+const defaultEnv = 'prod'
+const chainId = 1
+const tradeType = 'swap'
+
+describe('buildWidgetUrl', () => {
+  describe('env', () => {
+    it('local', () => {
+      const url = buildWidgetUrl({ chainId, tradeType, env: 'local' })
+      expect(url).toEqual('http://localhost:3000/#/1/widget/swap/?')
+    })
+    it('prod', () => {
+      const url = buildWidgetUrl({ chainId, tradeType, env: 'prod' })
+      expect(url).toEqual('https://swap.cow.fi/#/1/widget/swap/?')
+    })
+  })
+
+  describe('chainId', () => {
+    it('mainnet', () => {
+      const url = buildWidgetUrl({ chainId: 1, tradeType, env: defaultEnv })
+      expect(url).toEqual('https://swap.cow.fi/#/1/widget/swap/?')
+    })
+    it('gnosis chain', () => {
+      const url = buildWidgetUrl({ chainId: 5, tradeType, env: defaultEnv })
+      expect(url).toEqual('https://swap.cow.fi/#/5/widget/swap/?')
+    })
+  })
+
+  describe('theme', () => {
+    it('dark', () => {
+      const url = buildWidgetUrl({ theme: 'dark', chainId, tradeType, env: defaultEnv })
+      expect(url).toEqual('https://swap.cow.fi/#/1/widget/swap/?theme=dark')
+    })
+    it('light', () => {
+      const url = buildWidgetUrl({ theme: 'light', chainId, tradeType, env: defaultEnv })
+      expect(url).toEqual('https://swap.cow.fi/#/1/widget/swap/?theme=light')
+    })
+  })
+
+  describe('trade assets', () => {
+    it('without amounts', () => {
+      const url = buildWidgetUrl({
+        tradeAssets: { sell: { asset: 'WETH' }, buy: { asset: 'COW' } },
+        chainId,
+        tradeType,
+        env: defaultEnv,
+      })
+      expect(url).toEqual('https://swap.cow.fi/#/1/widget/swap/WETH/COW?')
+    })
+
+    it('with sell amount', () => {
+      const url = buildWidgetUrl({
+        tradeAssets: { sell: { asset: 'DAI', amount: '0.1' }, buy: { asset: 'USDC' } },
+        chainId,
+        tradeType,
+        env: defaultEnv,
+      })
+      expect(url).toEqual('https://swap.cow.fi/#/1/widget/swap/DAI/USDC?sellAmount=0.1')
+    })
+
+    it('with buy amount', () => {
+      const url = buildWidgetUrl({
+        tradeAssets: { sell: { asset: 'DAI' }, buy: { asset: 'USDC', amount: '0.1' } },
+        chainId,
+        tradeType,
+        env: defaultEnv,
+      })
+      expect(url).toEqual('https://swap.cow.fi/#/1/widget/swap/DAI/USDC?buyAmount=0.1')
+    })
+  })
+
+  describe('all config', () => {
+    it('dark', () => {
+      const url = buildWidgetUrl({
+        env: 'prod',
+        chainId: 100,
+        tradeType,
+        theme: 'light',
+        tradeAssets: { sell: { asset: 'DAI', amount: '0.1' }, buy: { asset: 'USDC', amount: '0.1' } },
+      })
+      expect(url).toEqual('https://swap.cow.fi/#/100/widget/swap/DAI/USDC?sellAmount=0.1&buyAmount=0.1&theme=light')
+    })
+  })
+})
diff --git a/src/libs/widget-lib/src/utils.ts b/src/libs/widget-lib/src/urlUtils.ts
similarity index 81%
rename from src/libs/widget-lib/src/utils.ts
rename to src/libs/widget-lib/src/urlUtils.ts
index 0cd02caad7..5765c1fc5b 100644
--- a/src/libs/widget-lib/src/utils.ts
+++ b/src/libs/widget-lib/src/urlUtils.ts
@@ -1,8 +1,8 @@
-import { COWSWAP_URLS, DEFAULT_CHAIN } from './consts'
+import { COWSWAP_URLS } from './consts'
 import { CowSwapWidgetUrlParams } from './types'
 
 export function buildWidgetUrl(params: CowSwapWidgetUrlParams): string {
-  const host = COWSWAP_URLS[params.env ?? 'prod']
+  const host = COWSWAP_URLS[params.env]
   const path = buildWidgetPath(params)
   const query = buildTradeAmountsQuery(params)
 
@@ -10,13 +10,13 @@ export function buildWidgetUrl(params: CowSwapWidgetUrlParams): string {
 }
 
 export function buildWidgetPath(params: CowSwapWidgetUrlParams): string {
-  const { chainId = DEFAULT_CHAIN, tradeAssets } = params
+  const { chainId, tradeAssets, tradeType } = params
 
   const assetsPath = tradeAssets
     ? [tradeAssets.sell.asset, tradeAssets.buy.asset].map(encodeURIComponent).join('/')
     : ''
 
-  return `/${chainId}/swap/widget/${assetsPath}`
+  return `/${chainId}/widget/${tradeType}/${assetsPath}`
 }
 
 export function buildTradeAmountsQuery(params: CowSwapWidgetUrlParams): URLSearchParams {
diff --git a/src/libs/widget-lib/src/utils.spec.ts b/src/libs/widget-lib/src/utils.spec.ts
deleted file mode 100644
index 46c9cd0c52..0000000000
--- a/src/libs/widget-lib/src/utils.spec.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-import { buildWidgetUrl } from './utils'
-
-describe('buildWidgetUrl', () => {
-  it('minimal config', () => {
-    const url = buildWidgetUrl({})
-    expect(url).toEqual('http://swap.cow.fi/#/1/swap/widget/?')
-  })
-
-  describe('env', () => {
-    it('local', () => {
-      const url = buildWidgetUrl({ env: 'local' })
-      expect(url).toEqual('http://localhost:3000/#/1/swap/widget/?')
-    })
-    it('prod', () => {
-      const url = buildWidgetUrl({ env: 'prod' })
-      expect(url).toEqual('http://swap.cow.fi/#/1/swap/widget/?')
-    })
-
-    it('barn', () => {
-      const url = buildWidgetUrl({ env: 'barn' })
-      expect(url).toEqual('https://barn.cow.fi/#/1/swap/widget/?')
-    })
-  })
-
-  describe('chainId', () => {
-    it('mainnet', () => {
-      const url = buildWidgetUrl({ chainId: 1 })
-      expect(url).toEqual('http://swap.cow.fi/#/1/swap/widget/?')
-    })
-    it('gnosis chain', () => {
-      const url = buildWidgetUrl({ chainId: 5 })
-      expect(url).toEqual('http://swap.cow.fi/#/5/swap/widget/?')
-    })
-  })
-
-  describe('theme', () => {
-    it('dark', () => {
-      const url = buildWidgetUrl({ theme: 'dark' })
-      expect(url).toEqual('http://swap.cow.fi/#/1/swap/widget/?theme=dark')
-    })
-    it('light', () => {
-      const url = buildWidgetUrl({ theme: 'light' })
-      expect(url).toEqual('http://swap.cow.fi/#/1/swap/widget/?theme=light')
-    })
-  })
-
-  describe('trade assets', () => {
-    it('without amounts', () => {
-      const url = buildWidgetUrl({ tradeAssets: { sell: { asset: 'WETH' }, buy: { asset: 'COW' } } })
-      expect(url).toEqual('http://swap.cow.fi/#/1/swap/widget/WETH/COW?')
-    })
-
-    it('with sell amount', () => {
-      const url = buildWidgetUrl({ tradeAssets: { sell: { asset: 'DAI', amount: '0.1' }, buy: { asset: 'USDC' } } })
-      expect(url).toEqual('http://swap.cow.fi/#/1/swap/widget/DAI/USDC?sellAmount=0.1')
-    })
-
-    it('with buy amount', () => {
-      const url = buildWidgetUrl({ tradeAssets: { sell: { asset: 'DAI' }, buy: { asset: 'USDC', amount: '0.1' } } })
-      expect(url).toEqual('http://swap.cow.fi/#/1/swap/widget/DAI/USDC?buyAmount=0.1')
-    })
-  })
-
-  describe('all config', () => {
-    it('dark', () => {
-      const url = buildWidgetUrl({
-        env: 'barn',
-        chainId: 100,
-        theme: 'light',
-        tradeAssets: { sell: { asset: 'DAI', amount: '0.1' }, buy: { asset: 'USDC', amount: '0.1' } },
-      })
-      expect(url).toEqual('https://barn.cow.fi/#/100/swap/widget/DAI/USDC?sellAmount=0.1&buyAmount=0.1&theme=light')
-    })
-  })
-})
diff --git a/src/libs/widget-lib/vite.config.ts b/src/libs/widget-lib/vite.config.ts
index 7155209003..22e52d0352 100644
--- a/src/libs/widget-lib/vite.config.ts
+++ b/src/libs/widget-lib/vite.config.ts
@@ -4,45 +4,67 @@ import { defineConfig } from 'vite'
 import dts from 'vite-plugin-dts'
 import viteTsConfigPaths from 'vite-tsconfig-paths'
 
-export default defineConfig({
-  cacheDir: '../../../node_modules/.vite/widget-lib',
+export default defineConfig(({ command }) => {
+  if (command === 'serve') {
+    const entryPoint = './src/demo/index.html'
 
-  plugins: [
-    dts({
-      entryRoot: 'src',
-      tsConfigFilePath: joinPathFragments(__dirname, 'tsconfig.lib.json'),
-      skipDiagnostics: true,
-    }),
+    return {
+      server: {
+        open: entryPoint,
+        fs: {
+          allow: ['..'],
+        },
+      },
+      build: {
+        rollupOptions: {
+          input: {
+            main: entryPoint,
+          },
+        },
+      },
+    }
+  }
 
-    viteTsConfigPaths({
-      root: '../../../',
-    }),
-  ],
+  return {
+    cacheDir: '../../../node_modules/.vite/widget-lib',
 
-  // Uncomment this if you are using workers.
-  // worker: {
-  //  plugins: [
-  //    viteTsConfigPaths({
-  //      root: '../../../',
-  //    }),
-  //  ],
-  // },
+    plugins: [
+      dts({
+        entryRoot: 'src',
+        tsConfigFilePath: joinPathFragments(__dirname, 'tsconfig.lib.json'),
+        skipDiagnostics: true,
+      }),
 
-  // Configuration for building your library.
-  // See: https://vitejs.dev/guide/build.html#library-mode
-  build: {
-    lib: {
-      // Could also be a dictionary or array of multiple entry points.
-      entry: 'src/index.ts',
-      name: 'widget-lib',
-      fileName: 'index',
-      // Change this to the formats you want to support.
-      // Don't forgot to update your package.json as well.
-      formats: ['es', 'cjs'],
-    },
-    rollupOptions: {
-      // External packages that should not be bundled into your library.
-      external: [],
+      viteTsConfigPaths({
+        root: '../../../',
+      }),
+    ],
+
+    // Uncomment this if you are using workers.
+    // worker: {
+    //  plugins: [
+    //    viteTsConfigPaths({
+    //      root: '../../../',
+    //    }),
+    //  ],
+    // },
+
+    // Configuration for building your library.
+    // See: https://vitejs.dev/guide/build.html#library-mode
+    build: {
+      lib: {
+        // Could also be a dictionary or array of multiple entry points.
+        entry: 'src/index.ts',
+        name: 'widget-lib',
+        fileName: 'index',
+        // Change this to the formats you want to support.
+        // Don't forgot to update your package.json as well.
+        formats: ['es', 'cjs'],
+      },
+      rollupOptions: {
+        // External packages that should not be bundled into your library.
+        external: [],
+      },
     },
-  },
+  }
 })
diff --git a/src/modules/application/containers/App/RoutesApp.tsx b/src/modules/application/containers/App/RoutesApp.tsx
index 3182aa6f1a..36516dce01 100644
--- a/src/modules/application/containers/App/RoutesApp.tsx
+++ b/src/modules/application/containers/App/RoutesApp.tsx
@@ -8,7 +8,7 @@ import Loader from 'legacy/components/Loader'
 import { DISCORD_LINK, DOCS_LINK, DUNE_DASHBOARD_LINK, TWITTER_LINK } from 'legacy/constants'
 import { RedirectPathToSwapOnly } from 'legacy/pages/Swap/redirects'
 
-import { Routes as RoutesEnum } from 'common/constants/routes'
+import { Routes as RoutesEnum, RoutesValues } from 'common/constants/routes'
 import Account, { AccountOverview } from 'pages/Account'
 import AnySwapAffectedUsers from 'pages/error/AnySwapAffectedUsers'
 import { SwapPage } from 'pages/Swap'
@@ -36,8 +36,6 @@ const EthFlowFaq = lazy(() => import(/* webpackChunkName: "eth_flow_faq" */ 'pag
 const AccountTokensOverview = lazy(() => import(/* webpackChunkName: "tokens_overview" */ 'pages/Account/Tokens'))
 const AccountNotFound = lazy(() => import(/* webpackChunkName: "affiliate" */ 'pages/error/NotFound'))
 
-const KitchenSink = lazy(() => import(/* webpackChunkName: "kitchen_sink" */ 'pages/KitchenSink'))
-
 function createRedirectExternal(url: string) {
   return () => {
     window.location.replace(url)
@@ -45,7 +43,7 @@ function createRedirectExternal(url: string) {
   }
 }
 
-type LazyRouteProps = { route: RoutesEnum; element: ReactNode; key?: number }
+type LazyRouteProps = { route: RoutesValues; element: ReactNode; key?: number }
 
 function LazyRoute({ route, element, key }: LazyRouteProps) {
   return <Route key={key} path={route} element={<Suspense fallback={Loading}>{element}</Suspense>} />
@@ -66,7 +64,6 @@ const lazyRoutes: LazyRouteProps[] = [
   { route: RoutesEnum.PRIVACY_POLICY, element: <PrivacyPolicy /> },
   { route: RoutesEnum.COOKIE_POLICY, element: <CookiePolicy /> },
   { route: RoutesEnum.TERMS_CONDITIONS, element: <TermsAndConditions /> },
-  { route: RoutesEnum.KITCHEN_SINK, element: <KitchenSink /> },
 ]
 
 export function RoutesApp() {
diff --git a/src/modules/application/containers/App/Updaters.tsx b/src/modules/application/containers/App/Updaters.tsx
index f06d25787a..e7552ff273 100644
--- a/src/modules/application/containers/App/Updaters.tsx
+++ b/src/modules/application/containers/App/Updaters.tsx
@@ -17,10 +17,12 @@ import SentryUpdater from 'legacy/state/sentry/updater'
 import UserUpdater from 'legacy/state/user/updater'
 
 import { UploadToIpfsUpdater, AppDataUpdater } from 'modules/appData'
+import { InjectedWidgetUpdater } from 'modules/injectedWidget'
 import { EthFlowSlippageUpdater, EthFlowDeadlineUpdater } from 'modules/swap/state/EthFlow/updaters'
 import { TokensListUpdater } from 'modules/tokensList/updaters/TokensListUpdater'
 import { WalletUpdater } from 'modules/wallet'
 
+import { ThemeFromUrlUpdater } from 'common/updaters/ThemeFromUrlUpdater'
 import { MulticallUpdater } from 'lib/state/multicall'
 
 export function Updaters() {
@@ -48,6 +50,8 @@ export function Updaters() {
       <EthFlowSlippageUpdater />
       <EthFlowDeadlineUpdater />
       <SpotPricesUpdater />
+      <ThemeFromUrlUpdater />
+      <InjectedWidgetUpdater />
     </>
   )
 }
diff --git a/src/modules/application/containers/App/index.tsx b/src/modules/application/containers/App/index.tsx
index 958cfd7bf9..cd5f7727d4 100644
--- a/src/modules/application/containers/App/index.tsx
+++ b/src/modules/application/containers/App/index.tsx
@@ -10,6 +10,7 @@ import DarkModeQueryParamReader from 'legacy/theme'
 
 import { useInitializeUtm } from 'modules/utm'
 
+import { isInjectedWidget } from 'common/utils/isInjectedWidget'
 import RedirectAnySwapAffectedUsers from 'pages/error/AnySwapAffectedUsers/RedirectAnySwapAffectedUsers'
 
 import { RoutesApp } from './RoutesApp'
@@ -20,11 +21,14 @@ export function App() {
   useAnalyticsReporter()
   useInitializeUtm()
 
+  const isInjectedWidgetMode = isInjectedWidget()
+
   return (
     <ErrorBoundary>
       <RedirectAnySwapAffectedUsers />
       <DarkModeQueryParamReader />
       <ApeModeQueryParamReader />
+
       <styledEl.AppWrapper>
         <URLWarning />
         <styledEl.HeaderWrapper>
@@ -35,9 +39,13 @@ export function App() {
           <RoutesApp />
           <styledEl.Marginer />
         </styledEl.BodyWrapper>
-        <styledEl.FooterWrapper>
-          <Footer />
-        </styledEl.FooterWrapper>
+        {isInjectedWidgetMode ? (
+          <styledEl.MarginerBottom></styledEl.MarginerBottom>
+        ) : (
+          <styledEl.FooterWrapper>
+            <Footer />
+          </styledEl.FooterWrapper>
+        )}
       </styledEl.AppWrapper>
     </ErrorBoundary>
   )
diff --git a/src/modules/application/containers/App/styled.ts b/src/modules/application/containers/App/styled.ts
index 32067a68e4..77980bf044 100644
--- a/src/modules/application/containers/App/styled.ts
+++ b/src/modules/application/containers/App/styled.ts
@@ -24,6 +24,10 @@ export const Marginer = styled.div`
   margin-top: 5rem;
 `
 
+export const MarginerBottom = styled.div`
+  margin-bottom: 60px;
+`
+
 export const BodyWrapper = styled.div`
   display: flex;
   flex-direction: row;
diff --git a/src/modules/injectedWidget/hooks/useInjectedWidgetParams.ts b/src/modules/injectedWidget/hooks/useInjectedWidgetParams.ts
new file mode 100644
index 0000000000..c8fb199646
--- /dev/null
+++ b/src/modules/injectedWidget/hooks/useInjectedWidgetParams.ts
@@ -0,0 +1,7 @@
+import { useAtomValue } from 'jotai/utils'
+
+import { injectedWidgetParamsAtom } from '../state/injectedWidgetParamsAtom'
+
+export function useInjectedWidgetParams() {
+  return useAtomValue(injectedWidgetParamsAtom)
+}
diff --git a/src/modules/injectedWidget/index.ts b/src/modules/injectedWidget/index.ts
new file mode 100644
index 0000000000..8015faac77
--- /dev/null
+++ b/src/modules/injectedWidget/index.ts
@@ -0,0 +1,2 @@
+export * from './updaters/InjectedWidgetUpdater'
+export * from './hooks/useInjectedWidgetParams'
diff --git a/src/modules/injectedWidget/state/injectedWidgetParamsAtom.ts b/src/modules/injectedWidget/state/injectedWidgetParamsAtom.ts
new file mode 100644
index 0000000000..aaec75aca2
--- /dev/null
+++ b/src/modules/injectedWidget/state/injectedWidgetParamsAtom.ts
@@ -0,0 +1,9 @@
+import { atom } from 'jotai'
+
+export interface InjectedWidgetParams {
+  logoUrl?: string
+  hideLogo?: boolean
+  hideNetworkSelector?: boolean
+}
+
+export const injectedWidgetParamsAtom = atom<InjectedWidgetParams>({})
diff --git a/src/modules/injectedWidget/updaters/InjectedWidgetUpdater.ts b/src/modules/injectedWidget/updaters/InjectedWidgetUpdater.ts
new file mode 100644
index 0000000000..d6742e5bb9
--- /dev/null
+++ b/src/modules/injectedWidget/updaters/InjectedWidgetUpdater.ts
@@ -0,0 +1,28 @@
+import { useUpdateAtom } from 'jotai/utils'
+import { useEffect } from 'react'
+
+import { useNavigate } from 'react-router-dom'
+
+import { injectedWidgetParamsAtom } from '../state/injectedWidgetParamsAtom'
+
+const COW_SWAP_WIDGET_EVENT_KEY = 'cowSwapWidget'
+
+export function InjectedWidgetUpdater() {
+  const updateParams = useUpdateAtom(injectedWidgetParamsAtom)
+  const navigate = useNavigate()
+
+  useEffect(() => {
+    window.addEventListener('message', (event) => {
+      const method = event.data.method
+
+      if (event.data.key !== COW_SWAP_WIDGET_EVENT_KEY || !method) return
+
+      if (method === 'update') {
+        updateParams(event.data.appParams)
+        navigate(event.data.urlParams)
+      }
+    })
+  }, [navigate, updateParams])
+
+  return null
+}
diff --git a/src/modules/mainMenu/pure/MenuTree/index.tsx b/src/modules/mainMenu/pure/MenuTree/index.tsx
index e264d44cd8..5b34a2becb 100644
--- a/src/modules/mainMenu/pure/MenuTree/index.tsx
+++ b/src/modules/mainMenu/pure/MenuTree/index.tsx
@@ -19,7 +19,7 @@ import {
 } from 'modules/mainMenu/types'
 import { parameterizeTradeRoute } from 'modules/trade/utils/parameterizeTradeRoute'
 
-import { Routes } from 'common/constants/routes'
+import { RoutesValues } from 'common/constants/routes'
 
 // Assets
 
@@ -54,7 +54,7 @@ function Link({ link, context }: InternalExternalLinkProps) {
   const isExternal = kind === MenuItemKind.EXTERNAL_LINK
   const isDynamic = kind === MenuItemKind.DYNAMIC_LINK
   const { handleMobileMenuOnClick, tradeContext } = context
-  const internalUrl = isDynamic ? parameterizeTradeRoute(tradeContext, url as Routes) : url
+  const internalUrl = isDynamic ? parameterizeTradeRoute(tradeContext, url as RoutesValues) : url
 
   if (isExternal) {
     return (
diff --git a/src/modules/mainMenu/types.ts b/src/modules/mainMenu/types.ts
index 156145fb70..e11038fc80 100644
--- a/src/modules/mainMenu/types.ts
+++ b/src/modules/mainMenu/types.ts
@@ -1,6 +1,6 @@
 import { TradeUrlParams } from 'modules/trade/types/TradeRawState'
 
-import { Routes } from 'common/constants/routes'
+import { RoutesValues } from 'common/constants/routes'
 
 export enum MenuItemKind {
   DROP_DOWN = 'DROP_DOWN',
@@ -52,7 +52,7 @@ export interface ExternalLink extends BasicMenuLink {
 }
 export interface DynamicLink extends BasicMenuLink {
   kind: MenuItemKind.DYNAMIC_LINK
-  url: Routes
+  url: RoutesValues
 }
 
 export type DarkModeLink = { kind: MenuItemKind.DARK_MODE_BUTTON }
diff --git a/src/modules/mainMenu/utils.ts b/src/modules/mainMenu/utils.ts
index a0eba0c536..b5780bcebf 100644
--- a/src/modules/mainMenu/utils.ts
+++ b/src/modules/mainMenu/utils.ts
@@ -1,10 +1,10 @@
 import cloneDeep from 'clone-deep'
 
+import { Routes } from 'common/constants/routes'
+
 import { MAIN_MENU } from './constants/mainMenu'
 import { DropDownItem, MainMenuItemId, MenuItemKind, MenuTreeItem } from './types'
 
-import { Routes } from '../../common/constants/routes'
-
 const ADVANCED_ORDERS_MENU_TITLE = 'Advanced orders'
 
 export type BuildMainMenuTreeItemsParams = {
diff --git a/src/modules/trade/hooks/useTradeTypeInfo.ts b/src/modules/trade/hooks/useTradeTypeInfo.ts
index f921e48661..9ed9c13e4f 100644
--- a/src/modules/trade/hooks/useTradeTypeInfo.ts
+++ b/src/modules/trade/hooks/useTradeTypeInfo.ts
@@ -3,7 +3,7 @@ import { useMemo } from 'react'
 import { PathMatch } from '@remix-run/router'
 import { useMatch } from 'react-router-dom'
 
-import { Routes } from 'common/constants/routes'
+import { Routes, RoutesValues, TRADE_WIDGET_PREFIX } from 'common/constants/routes'
 
 export enum TradeType {
   SWAP,
@@ -13,12 +13,12 @@ export enum TradeType {
 
 export interface TradeTypeInfo {
   tradeType: TradeType
-  route: Routes
+  route: RoutesValues
 }
 
 function useMatchTradeRoute(route: string): PathMatch<'chainId'> | null {
-  const withChainId = useMatch({ path: `/:chainId/${route}/`, end: false })
-  const withoutChainId = useMatch({ path: `/${route}/`, end: false })
+  const withChainId = useMatch({ path: `/:chainId${TRADE_WIDGET_PREFIX}/${route}/`, end: false })
+  const withoutChainId = useMatch({ path: `${TRADE_WIDGET_PREFIX}/${route}/`, end: false })
 
   return withChainId || withoutChainId
 }
diff --git a/src/modules/trade/utils/parameterizeTradeRoute.ts b/src/modules/trade/utils/parameterizeTradeRoute.ts
index c9fda931ba..b39252c886 100644
--- a/src/modules/trade/utils/parameterizeTradeRoute.ts
+++ b/src/modules/trade/utils/parameterizeTradeRoute.ts
@@ -1,6 +1,6 @@
 import { TradeUrlParams } from 'modules/trade/types/TradeRawState'
 
-import { Routes } from 'common/constants/routes'
+import { RoutesValues } from 'common/constants/routes'
 
 /**
  * When input currency is not set and user select output currency, we build a link like:
@@ -8,7 +8,7 @@ import { Routes } from 'common/constants/routes'
  */
 export function parameterizeTradeRoute(
   { chainId, inputCurrencyId, outputCurrencyId }: TradeUrlParams,
-  route: Routes
+  route: RoutesValues
 ): string {
   return route
     .replace('/:chainId?', chainId ? `/${encodeURIComponent(chainId)}` : '')
diff --git a/src/modules/wallet/api/types.ts b/src/modules/wallet/api/types.ts
index c42af3da4b..75ad484297 100644
--- a/src/modules/wallet/api/types.ts
+++ b/src/modules/wallet/api/types.ts
@@ -3,6 +3,7 @@ import { SafeInfoResponse } from '@safe-global/api-kit'
 
 export enum ConnectionType {
   INJECTED = 'INJECTED',
+  INJECTED_WIDGET = 'INJECTED_WIDGET',
   COINBASE_WALLET = 'COINBASE_WALLET',
   WALLET_CONNECT = 'WALLET_CONNECT',
   FORTMATIC = 'FORTMATIC',
diff --git a/src/modules/wallet/api/utils/connection.ts b/src/modules/wallet/api/utils/connection.ts
index 7dbe1eda1b..685b5a64cc 100644
--- a/src/modules/wallet/api/utils/connection.ts
+++ b/src/modules/wallet/api/utils/connection.ts
@@ -28,6 +28,8 @@ export function getConnectionName(connectionType: ConnectionType, isMetaMask?: b
       return 'Ledger'
     case ConnectionType.KEYSTONE:
       return 'Keystone'
+    case ConnectionType.INJECTED_WIDGET:
+      return 'CowSwap widget'
   }
 }
 
diff --git a/src/modules/wallet/web3-react/connection/index.tsx b/src/modules/wallet/web3-react/connection/index.tsx
index 98365fc3d4..37f4c9aced 100644
--- a/src/modules/wallet/web3-react/connection/index.tsx
+++ b/src/modules/wallet/web3-react/connection/index.tsx
@@ -13,6 +13,7 @@ import { coinbaseWalletConnection } from './coinbase'
 import { fortmaticConnection } from './formatic'
 import { InjectedOption, InstallMetaMaskOption, MetaMaskOption, OpenMetaMaskMobileOption } from './injected'
 import { injectedConnection } from './injected'
+import { injectedWidgetConnection } from './injectedWidget'
 import { InstallKeystoneOption, keystoneConnection, KeystoneOption } from './keystone'
 import { ledgerConnection, LedgerOption } from './ledger'
 import { networkConnection } from './network'
@@ -37,6 +38,7 @@ const CONNECTIONS: Web3ReactConnection[] = [
   trustWalletConnection,
   ledgerConnection,
   keystoneConnection,
+  injectedWidgetConnection,
 ]
 
 export function isChainAllowed(connector: Connector, chainId: number) {
@@ -50,6 +52,7 @@ export function isChainAllowed(connector: Connector, chainId: number) {
     case gnosisSafeConnection.connector:
     case tallyWalletConnection.connector:
     case trustWalletConnection.connector:
+    case injectedWidgetConnection.connector:
     case ledgerConnection.connector:
     case keystoneConnection.connector:
       return ALL_SUPPORTED_CHAIN_IDS.includes(chainId)
@@ -93,6 +96,8 @@ export function getWeb3ReactConnection(c: Connector | ConnectionType): Web3React
         return ledgerConnection
       case ConnectionType.KEYSTONE:
         return keystoneConnection
+      case ConnectionType.INJECTED_WIDGET:
+        return injectedWidgetConnection
     }
   }
 }
diff --git a/src/modules/wallet/web3-react/connection/injectedWidget.tsx b/src/modules/wallet/web3-react/connection/injectedWidget.tsx
new file mode 100644
index 0000000000..c974920f3a
--- /dev/null
+++ b/src/modules/wallet/web3-react/connection/injectedWidget.tsx
@@ -0,0 +1,19 @@
+import { initializeConnector } from '@web3-react/core'
+
+import { ConnectionType } from '../../api/types'
+import { InjectedWallet } from '../connectors/Injected'
+import { Web3ReactConnection } from '../types'
+
+const [web3Injected, web3InjectedHooks] = initializeConnector<InjectedWallet>(
+  (actions) =>
+    new InjectedWallet({
+      actions,
+      walletUrl: '',
+      searchKeywords: [],
+    })
+)
+export const injectedWidgetConnection: Web3ReactConnection = {
+  connector: web3Injected,
+  hooks: web3InjectedHooks,
+  type: ConnectionType.INJECTED_WIDGET,
+}
diff --git a/src/modules/wallet/web3-react/connectors/Injected/IFrameEthereumProvider.ts b/src/modules/wallet/web3-react/connectors/Injected/IFrameEthereumProvider.ts
new file mode 100644
index 0000000000..648ab21f1c
--- /dev/null
+++ b/src/modules/wallet/web3-react/connectors/Injected/IFrameEthereumProvider.ts
@@ -0,0 +1,11 @@
+import { IFrameEthereumProvider as OriginalIFrameEthereumProvider } from '@ethvault/iframe-provider'
+
+export class IFrameEthereumProvider extends OriginalIFrameEthereumProvider {
+  request<T>({ method, params }: { method: string; params?: any[] }) {
+    return this.send<typeof params, T>(method, params)
+  }
+
+  isConnected(): true {
+    return true
+  }
+}
diff --git a/src/modules/wallet/web3-react/connectors/Injected/index.tsx b/src/modules/wallet/web3-react/connectors/Injected/index.tsx
index 79f2083488..3cbb16b8b8 100644
--- a/src/modules/wallet/web3-react/connectors/Injected/index.tsx
+++ b/src/modules/wallet/web3-react/connectors/Injected/index.tsx
@@ -10,14 +10,14 @@ import {
 
 import { isRejectRequestProviderError } from 'legacy/utils/misc'
 
+import { isInjectedWidget } from 'common/utils/isInjectedWidget'
+
+import { IFrameEthereumProvider } from './IFrameEthereumProvider'
+
 type InjectedWalletProvider = Provider & {
-  providers?: Omit<InjectedWalletProvider, 'providers'>[]
   isConnected: () => boolean
   request<T>(args: RequestArguments): Promise<T>
-  chainId: string
-  selectedAddress: string
   enable?: () => void
-  isTrust?: boolean
   on: (event: string, args: unknown) => unknown
 }
 
@@ -118,9 +118,7 @@ export class InjectedWallet extends Connector {
       // Fix to call this only once
       this.eagerConnection = true
 
-      if (this.provider.isTrust) {
-        await this.provider.enable?.()
-      }
+      await this.provider.enable?.()
 
       // Wallets may resolve eth_chainId and hang on eth_accounts pending user interaction, which may include changing
       // chains; they should be requested serially, with accounts first, so that the chainId can settle.
@@ -143,7 +141,10 @@ export class InjectedWallet extends Connector {
     const provider = this.detectProvider()
 
     if (provider) {
-      provider.on('connect', ({ chainId }: ProviderConnectInfo): void => {
+      provider.on('connect', (data: ProviderConnectInfo): void => {
+        if (!data) return
+
+        const { chainId } = data
         this.actions.update({ chainId: parseChainId(chainId) })
       })
 
@@ -178,7 +179,13 @@ export class InjectedWallet extends Connector {
   // Mod: Added custom method
   // Method to target a specific provider on window.ethereum or window.ethereum.providers if it exists
   private detectProvider(): InjectedWalletProvider | void {
-    this.provider = this.detectOnEthereum(window.ethereum) || this.detectOnProvider(window.ethereum?.providers) || null
+    if (isInjectedWidget()) {
+      this.provider = new IFrameEthereumProvider() as InjectedWalletProvider
+    } else {
+      this.provider =
+        this.detectOnEthereum(window.ethereum) || this.detectOnProvider(window.ethereum?.providers) || null
+    }
+
     return this.provider
   }
 
diff --git a/src/modules/wallet/web3-react/hooks/useEagerlyConnect.ts b/src/modules/wallet/web3-react/hooks/useEagerlyConnect.ts
index 46a3d872c0..b67bf7bf6e 100644
--- a/src/modules/wallet/web3-react/hooks/useEagerlyConnect.ts
+++ b/src/modules/wallet/web3-react/hooks/useEagerlyConnect.ts
@@ -5,9 +5,13 @@ import { Connector } from '@web3-react/types'
 import { useAppSelector } from 'legacy/state/hooks'
 
 import { BACKFILLABLE_WALLETS } from 'modules/wallet/api/types'
-import { getWeb3ReactConnection } from 'modules/wallet/web3-react/connection'
-import { networkConnection } from 'modules/wallet/web3-react/connection/network'
-import { gnosisSafeConnection } from 'modules/wallet/web3-react/connection/safe'
+
+import { isInjectedWidget } from 'common/utils/isInjectedWidget'
+
+import { getWeb3ReactConnection } from '../connection'
+import { injectedWidgetConnection } from '../connection/injectedWidget'
+import { networkConnection } from '../connection/network'
+import { gnosisSafeConnection } from '../connection/safe'
 
 async function connect(connector: Connector) {
   try {
@@ -26,6 +30,10 @@ export function useEagerlyConnect() {
   const selectedWallet = useAppSelector((state) => state.user.selectedWallet)
 
   useEffect(() => {
+    if (isInjectedWidget()) {
+      connect(injectedWidgetConnection.connector)
+    }
+
     connect(gnosisSafeConnection.connector)
     connect(networkConnection.connector)
 
diff --git a/src/modules/wallet/web3-react/hooks/useOrderedConnections.ts b/src/modules/wallet/web3-react/hooks/useOrderedConnections.ts
index 31324c24de..622c8df2cc 100644
--- a/src/modules/wallet/web3-react/hooks/useOrderedConnections.ts
+++ b/src/modules/wallet/web3-react/hooks/useOrderedConnections.ts
@@ -5,13 +5,20 @@ import { useAppSelector } from 'legacy/state/hooks'
 import { BACKFILLABLE_WALLETS, ConnectionType } from 'modules/wallet'
 import { getWeb3ReactConnection } from 'modules/wallet/web3-react/connection'
 
+import { isInjectedWidget } from 'common/utils/isInjectedWidget'
+
 const SELECTABLE_WALLETS = [...BACKFILLABLE_WALLETS, ConnectionType.FORTMATIC]
 
+// TODO: The logic looks very similar with useEagerlyConnect
 export function useOrderedConnections() {
   const selectedWallet = useAppSelector((state) => state.user.selectedWallet)
   return useMemo(() => {
     const orderedConnectionTypes: ConnectionType[] = []
 
+    if (isInjectedWidget()) {
+      orderedConnectionTypes.push(ConnectionType.INJECTED_WIDGET)
+    }
+
     // Always attempt to use to Gnosis Safe first, as we can't know if we're in a SafeContext.
     orderedConnectionTypes.push(ConnectionType.GNOSIS_SAFE)
 
diff --git a/yarn.lock b/yarn.lock
index e5a26e0dc8..e04b547804 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3118,6 +3118,13 @@
     "@ethersproject/properties" "^5.7.0"
     "@ethersproject/strings" "^5.7.0"
 
+"@ethvault/iframe-provider@^0.1.10":
+  version "0.1.10"
+  resolved "https://registry.yarnpkg.com/@ethvault/iframe-provider/-/iframe-provider-0.1.10.tgz#75f35d9bc651587d104ef86843c1d13fe4bc7968"
+  integrity sha512-TKz7B9/e8gkb2V88YwvAPu7Rp7yISNG+oML0zK8mDwSRZXlj1ubBHHG0b6sdpgDoAE6PnI4IhGdy2IEczCW7kA==
+  dependencies:
+    eventemitter3 "^4.0.0"
+
 "@fontsource/ibm-plex-mono@^4.5.1":
   version "4.5.13"
   resolved "https://registry.yarnpkg.com/@fontsource/ibm-plex-mono/-/ibm-plex-mono-4.5.13.tgz#f91559ab3b5074a8e2db75c0370b9640e80c99b2"

From 3460be6ab62036758dfbbc10d6753372438d1fb0 Mon Sep 17 00:00:00 2001
From: Alexandr Kazachenko <shoom3301@gmail.com>
Date: Mon, 26 Jun 2023 12:54:55 +0600
Subject: [PATCH 31/67] feat(twap): display and confirm price impact (#2672)

---
 .../hooks/useConfirmPriceImpactWithoutFee.ts  |  2 +-
 src/legacy/hooks/usePriceImpact/index.ts      |  6 +-
 .../containers/AdvancedOrdersWidget/index.tsx |  9 +--
 .../containers/LimitOrdersWidget/index.tsx    |  6 +-
 .../hooks/useLimitOrdersPriceImpactParams.ts  | 31 --------
 .../trade/containers/TradeWidget/index.tsx    |  2 +
 .../trade/hooks/useTradePriceImpact.ts        |  7 ++
 .../trade/hooks/useTradePriceImpactParams.ts  | 35 +++++++++
 src/modules/trade/index.ts                    |  1 +
 .../trade/pure/TradeConfirmation/styled.tsx   |  1 +
 src/modules/trade/state/priceImpactAtom.ts    |  9 +++
 .../trade/updaters/PriceImpactUpdater.tsx     | 21 ++++++
 .../twap/containers/ActionButtons/index.tsx   | 16 ++--
 .../containers/TwapConfirmModal/index.tsx     | 13 ++--
 .../containers/TwapFormWarnings/index.tsx     | 73 +++++++++++++------
 .../twap/containers/TwapFormWidget/index.tsx  | 23 +++---
 src/modules/twap/hooks/useCreateTwapOrder.ts  | 15 +++-
 .../hooks/useFallbackHandlerVerification.ts   |  7 ++
 src/modules/twap/hooks/useTwapFormState.ts    | 14 +---
 .../twap/hooks/useTwapWarningsContext.ts      | 29 ++++++++
 .../PrimaryActionButton/getTwapFormState.tsx  | 16 ++--
 .../twap/pure/PrimaryActionButton/index.tsx   |  5 --
 .../state/fallbackHandlerVerificationAtom.ts  |  5 ++
 .../twap/state/twapOrdersSettingsAtom.ts      |  2 +
 .../FallbackHandlerVerificationUpdater.tsx    | 25 +++++++
 25 files changed, 254 insertions(+), 119 deletions(-)
 delete mode 100644 src/modules/limitOrders/hooks/useLimitOrdersPriceImpactParams.ts
 create mode 100644 src/modules/trade/hooks/useTradePriceImpact.ts
 create mode 100644 src/modules/trade/hooks/useTradePriceImpactParams.ts
 create mode 100644 src/modules/trade/state/priceImpactAtom.ts
 create mode 100644 src/modules/trade/updaters/PriceImpactUpdater.tsx
 create mode 100644 src/modules/twap/hooks/useFallbackHandlerVerification.ts
 create mode 100644 src/modules/twap/hooks/useTwapWarningsContext.ts
 create mode 100644 src/modules/twap/state/fallbackHandlerVerificationAtom.ts
 create mode 100644 src/modules/twap/updaters/FallbackHandlerVerificationUpdater.tsx

diff --git a/src/common/hooks/useConfirmPriceImpactWithoutFee.ts b/src/common/hooks/useConfirmPriceImpactWithoutFee.ts
index fe9b5909a5..d018aa2ad7 100644
--- a/src/common/hooks/useConfirmPriceImpactWithoutFee.ts
+++ b/src/common/hooks/useConfirmPriceImpactWithoutFee.ts
@@ -29,7 +29,7 @@ export function useConfirmPriceImpactWithoutFee() {
   const [isConfirmed, setIsConfirmed] = useState(false)
   const triggerConfirmation = useConfirmationRequest({ onEnable: () => setIsConfirmed(true) })
   const confirmPriceImpactWithoutFee = useCallback(
-    async (priceImpactWithoutFee: Percent) => {
+    async (priceImpactWithoutFee: Percent | undefined) => {
       if (
         !!priceImpactWithoutFee &&
         (!priceImpactWithoutFee.lessThan(PRICE_IMPACT_WITHOUT_FEE_CONFIRM_MIN) ||
diff --git a/src/legacy/hooks/usePriceImpact/index.ts b/src/legacy/hooks/usePriceImpact/index.ts
index 1bd7d31f70..b4bd615928 100644
--- a/src/legacy/hooks/usePriceImpact/index.ts
+++ b/src/legacy/hooks/usePriceImpact/index.ts
@@ -1,3 +1,5 @@
+import { useMemo } from 'react'
+
 import { Percent } from '@uniswap/sdk-core'
 
 import { QuoteError } from 'legacy/state/price/actions'
@@ -39,5 +41,7 @@ export default function usePriceImpact({ abTrade, parsedAmounts, isWrapping }: P
 
   const priceImpact = fiatPriceImpact || fallbackPriceImpact
 
-  return { priceImpact, error: fiatPriceImpact ? undefined : error, loading }
+  return useMemo(() => {
+    return { priceImpact, error: fiatPriceImpact ? undefined : error, loading }
+  }, [priceImpact, fiatPriceImpact, error, loading])
 }
diff --git a/src/modules/advancedOrders/containers/AdvancedOrdersWidget/index.tsx b/src/modules/advancedOrders/containers/AdvancedOrdersWidget/index.tsx
index fd62f8456e..dbb2ed52c0 100644
--- a/src/modules/advancedOrders/containers/AdvancedOrdersWidget/index.tsx
+++ b/src/modules/advancedOrders/containers/AdvancedOrdersWidget/index.tsx
@@ -9,7 +9,7 @@ import {
   useAdvancedOrdersDerivedState,
   useFillAdvancedOrdersDerivedState,
 } from 'modules/advancedOrders/hooks/useAdvancedOrdersDerivedState'
-import { useSetupTradeState, TradeWidget, TradeWidgetSlots } from 'modules/trade'
+import { useSetupTradeState, useTradePriceImpact, TradeWidget, TradeWidgetSlots } from 'modules/trade'
 import { useTradeQuote, useSetTradeQuoteParams } from 'modules/tradeQuote'
 import { partsStateAtom } from 'modules/twap/state/partsStateAtom'
 
@@ -34,6 +34,7 @@ export function AdvancedOrdersWidget({ children }: { children: JSX.Element }) {
   const actions = useAdvancedOrdersActions()
   const { isLoading: isTradePriceUpdating } = useTradeQuote()
   const { inputPartAmount } = useAtomValue(partsStateAtom)
+  const priceImpact = useTradePriceImpact()
 
   useSetTradeQuoteParams(inputPartAmount)
 
@@ -67,11 +68,7 @@ export function AdvancedOrdersWidget({ children }: { children: JSX.Element }) {
     compactView: false,
     showRecipient: false,
     isTradePriceUpdating,
-    priceImpact: {
-      priceImpact: undefined,
-      error: undefined,
-      loading: false,
-    },
+    priceImpact,
   }
 
   return (
diff --git a/src/modules/limitOrders/containers/LimitOrdersWidget/index.tsx b/src/modules/limitOrders/containers/LimitOrdersWidget/index.tsx
index f6817a6f92..b738d1a63d 100644
--- a/src/modules/limitOrders/containers/LimitOrdersWidget/index.tsx
+++ b/src/modules/limitOrders/containers/LimitOrdersWidget/index.tsx
@@ -4,18 +4,16 @@ import React, { useMemo } from 'react'
 
 import { OrderKind } from '@cowprotocol/cow-sdk'
 
-import usePriceImpact from 'legacy/hooks/usePriceImpact'
 import { Field } from 'legacy/state/swap/actions'
 
 import { LimitOrdersWarnings } from 'modules/limitOrders/containers/LimitOrdersWarnings'
 import { useLimitOrdersWidgetActions } from 'modules/limitOrders/containers/LimitOrdersWidget/hooks/useLimitOrdersWidgetActions'
 import { TradeButtons } from 'modules/limitOrders/containers/TradeButtons'
 import { useDisableNativeTokenSelling } from 'modules/limitOrders/hooks/useDisableNativeTokenSelling'
-import { useLimitOrdersPriceImpactParams } from 'modules/limitOrders/hooks/useLimitOrdersPriceImpactParams'
 import { useSetupLimitOrderAmountsFromUrl } from 'modules/limitOrders/hooks/useSetupLimitOrderAmountsFromUrl'
 import { InfoBanner } from 'modules/limitOrders/pure/InfoBanner'
 import { partiallyFillableOverrideAtom } from 'modules/limitOrders/state/partiallyFillableOverride'
-import { TradeWidget, useSetupTradeState } from 'modules/trade'
+import { TradeWidget, useSetupTradeState, useTradePriceImpact } from 'modules/trade'
 import { useIsWrapOrUnwrap } from 'modules/trade/hooks/useIsWrapOrUnwrap'
 import { useSetTradeQuoteParams, useTradeQuote } from 'modules/tradeQuote'
 
@@ -78,7 +76,7 @@ export function LimitOrdersWidget() {
     [isWrapOrUnwrap, settingsState.expertMode]
   )
 
-  const priceImpact = usePriceImpact(useLimitOrdersPriceImpactParams())
+  const priceImpact = useTradePriceImpact()
   const quoteAmount = useMemo(
     () => (orderKind === OrderKind.SELL ? inputCurrencyAmount : outputCurrencyAmount),
     [orderKind, inputCurrencyAmount, outputCurrencyAmount]
diff --git a/src/modules/limitOrders/hooks/useLimitOrdersPriceImpactParams.ts b/src/modules/limitOrders/hooks/useLimitOrdersPriceImpactParams.ts
deleted file mode 100644
index 63a08697c4..0000000000
--- a/src/modules/limitOrders/hooks/useLimitOrdersPriceImpactParams.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { useMemo } from 'react'
-
-import type { PriceImpactParams } from 'legacy/hooks/usePriceImpact'
-
-import { useLimitOrdersDerivedState } from 'modules/limitOrders/hooks/useLimitOrdersDerivedState'
-
-import { useSafeMemoObject } from 'common/hooks/useSafeMemo'
-
-export function useLimitOrdersPriceImpactParams(): PriceImpactParams {
-  const { inputCurrencyAmount, outputCurrencyAmount } = useLimitOrdersDerivedState()
-
-  const abTrade = useSafeMemoObject({
-    inputAmount: inputCurrencyAmount,
-    outputAmount: outputCurrencyAmount,
-    inputAmountWithoutFee: inputCurrencyAmount || undefined,
-    outputAmountWithoutFee: outputCurrencyAmount || undefined,
-  })
-
-  const parsedAmounts = useSafeMemoObject({
-    INPUT: inputCurrencyAmount || undefined,
-    OUTPUT: outputCurrencyAmount || undefined,
-  })
-
-  return useMemo(() => {
-    return {
-      abTrade,
-      parsedAmounts,
-      isWrapping: false,
-    }
-  }, [abTrade, parsedAmounts])
-}
diff --git a/src/modules/trade/containers/TradeWidget/index.tsx b/src/modules/trade/containers/TradeWidget/index.tsx
index 178d6df7b8..22c75d191f 100644
--- a/src/modules/trade/containers/TradeWidget/index.tsx
+++ b/src/modules/trade/containers/TradeWidget/index.tsx
@@ -19,6 +19,7 @@ import { CurrencyInfo } from 'common/pure/CurrencyInputPanel/types'
 import * as styledEl from './styled'
 import { TradeWidgetModals } from './TradeWidgetModals'
 
+import { PriceImpactUpdater } from '../../updaters/PriceImpactUpdater'
 import { WrapNativeModal } from '../WrapNativeModal'
 
 export interface TradeWidgetActions {
@@ -104,6 +105,7 @@ export function TradeWidget(props: TradeWidgetProps) {
       {!disableQuotePolling && <TradeQuoteUpdater />}
       <TradeWidgetModals />
       <WrapNativeModal />
+      <PriceImpactUpdater />
 
       <styledEl.Container id={id}>
         <styledEl.ContainerBox>
diff --git a/src/modules/trade/hooks/useTradePriceImpact.ts b/src/modules/trade/hooks/useTradePriceImpact.ts
new file mode 100644
index 0000000000..4fdcee6930
--- /dev/null
+++ b/src/modules/trade/hooks/useTradePriceImpact.ts
@@ -0,0 +1,7 @@
+import { useAtomValue } from 'jotai/utils'
+
+import { priceImpactAtom } from '../state/priceImpactAtom'
+
+export function useTradePriceImpact() {
+  return useAtomValue(priceImpactAtom)
+}
diff --git a/src/modules/trade/hooks/useTradePriceImpactParams.ts b/src/modules/trade/hooks/useTradePriceImpactParams.ts
new file mode 100644
index 0000000000..a07ec94e73
--- /dev/null
+++ b/src/modules/trade/hooks/useTradePriceImpactParams.ts
@@ -0,0 +1,35 @@
+import { useMemo } from 'react'
+
+import type { PriceImpactParams } from 'legacy/hooks/usePriceImpact'
+
+import { useDerivedTradeState } from './useDerivedTradeState'
+
+export function useTradePriceImpactParams(): PriceImpactParams {
+  const { state } = useDerivedTradeState()
+  const { inputCurrencyAmount, outputCurrencyAmount } = state || {
+    inputCurrencyAmount: null,
+    outputCurrencyAmount: null,
+  }
+
+  return useMemo(() => {
+    const abTrade = {
+      inputAmount: inputCurrencyAmount,
+      outputAmount: outputCurrencyAmount,
+      // TODO: before integrating in Swap - specify correct values
+      inputAmountWithoutFee: inputCurrencyAmount || undefined,
+      outputAmountWithoutFee: outputCurrencyAmount || undefined,
+    }
+
+    const parsedAmounts = {
+      INPUT: inputCurrencyAmount || undefined,
+      OUTPUT: outputCurrencyAmount || undefined,
+    }
+
+    return {
+      abTrade,
+      parsedAmounts,
+      isWrapping: false,
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [inputCurrencyAmount?.quotient.toString(), outputCurrencyAmount?.quotient.toString()])
+}
diff --git a/src/modules/trade/index.ts b/src/modules/trade/index.ts
index d0a42fe9bc..cadc5d77d0 100644
--- a/src/modules/trade/index.ts
+++ b/src/modules/trade/index.ts
@@ -3,6 +3,7 @@ export * from './containers/TradeConfirmModal'
 export * from './pure/TradeConfirmation'
 export * from './hooks/useTradeConfirmActions'
 export * from './hooks/useTradeTypeInfo'
+export * from './hooks/useTradePriceImpact'
 export * from './hooks/setupTradeState/useSetupTradeState'
 export * from './hooks/useWrapNativeFlow'
 export * from './types/TradeDerivedState'
diff --git a/src/modules/trade/pure/TradeConfirmation/styled.tsx b/src/modules/trade/pure/TradeConfirmation/styled.tsx
index 6d91f285dd..d79c30c070 100644
--- a/src/modules/trade/pure/TradeConfirmation/styled.tsx
+++ b/src/modules/trade/pure/TradeConfirmation/styled.tsx
@@ -32,6 +32,7 @@ export const Header = styled.div`
   justify-content: space-between;
   align-items: center;
   position: sticky;
+  background: ${({ theme }) => theme.bg1};
   top: 0;
   left: 0;
   width: 100%;
diff --git a/src/modules/trade/state/priceImpactAtom.ts b/src/modules/trade/state/priceImpactAtom.ts
new file mode 100644
index 0000000000..ac1a085664
--- /dev/null
+++ b/src/modules/trade/state/priceImpactAtom.ts
@@ -0,0 +1,9 @@
+import { atom } from 'jotai'
+
+import { PriceImpact } from 'legacy/hooks/usePriceImpact'
+
+export const priceImpactAtom = atom<PriceImpact>({
+  priceImpact: undefined,
+  error: undefined,
+  loading: false,
+})
diff --git a/src/modules/trade/updaters/PriceImpactUpdater.tsx b/src/modules/trade/updaters/PriceImpactUpdater.tsx
new file mode 100644
index 0000000000..2e9fc92d2d
--- /dev/null
+++ b/src/modules/trade/updaters/PriceImpactUpdater.tsx
@@ -0,0 +1,21 @@
+import { useUpdateAtom } from 'jotai/utils'
+import { useEffect } from 'react'
+
+import usePriceImpact from 'legacy/hooks/usePriceImpact'
+
+import { useTradePriceImpactParams } from '../hooks/useTradePriceImpactParams'
+import { priceImpactAtom } from '../state/priceImpactAtom'
+
+export function PriceImpactUpdater() {
+  const updatePriceImpact = useUpdateAtom(priceImpactAtom)
+  const params = useTradePriceImpactParams()
+  const priceImpact = usePriceImpact(params)
+  const priceImpactValue = priceImpact.priceImpact?.quotient.toString()
+
+  useEffect(() => {
+    updatePriceImpact(priceImpact)
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [priceImpactValue, priceImpact.loading, priceImpact.error, updatePriceImpact])
+
+  return null
+}
diff --git a/src/modules/twap/containers/ActionButtons/index.tsx b/src/modules/twap/containers/ActionButtons/index.tsx
index 1f91b66f36..2b35af0031 100644
--- a/src/modules/twap/containers/ActionButtons/index.tsx
+++ b/src/modules/twap/containers/ActionButtons/index.tsx
@@ -1,27 +1,29 @@
+import { useAtomValue } from 'jotai'
 import React from 'react'
 
 import { useTradeConfirmActions } from 'modules/trade'
 import { TradeFormButtons, TradeFormValidation } from 'modules/tradeFormValidation'
 import { useTradeFormButtonContext } from 'modules/tradeFormValidation'
 
+import { useTwapWarningsContext } from '../../hooks/useTwapWarningsContext'
 import { PrimaryActionButton } from '../../pure/PrimaryActionButton'
 import { TwapFormState } from '../../pure/PrimaryActionButton/getTwapFormState'
+import { twapOrdersSettingsAtom } from '../../state/twapOrdersSettingsAtom'
 
 interface ActionButtonsProps {
   localFormValidation: TwapFormState | null
   primaryFormValidation: TradeFormValidation | null
-  walletIsNotConnected: boolean
 }
 
-export function ActionButtons({
-  localFormValidation,
-  primaryFormValidation,
-  walletIsNotConnected,
-}: ActionButtonsProps) {
+export function ActionButtons({ localFormValidation, primaryFormValidation }: ActionButtonsProps) {
+  const { isPriceImpactAccepted } = useAtomValue(twapOrdersSettingsAtom)
   const tradeConfirmActions = useTradeConfirmActions()
+  const { walletIsNotConnected, showPriceImpactWarning } = useTwapWarningsContext()
 
   const confirmTrade = tradeConfirmActions.onOpen
 
+  const areWarningsAccepted = showPriceImpactWarning ? isPriceImpactAccepted : true
+
   const primaryActionContext = {
     confirmTrade,
   }
@@ -43,7 +45,7 @@ export function ActionButtons({
       context={tradeFormButtonContext}
       // TODO: bind isExpertMode to settings
       isExpertMode={false}
-      isDisabled={false}
+      isDisabled={!areWarningsAccepted}
     />
   )
 }
diff --git a/src/modules/twap/containers/TwapConfirmModal/index.tsx b/src/modules/twap/containers/TwapConfirmModal/index.tsx
index de181da5b4..afcdcc76f3 100644
--- a/src/modules/twap/containers/TwapConfirmModal/index.tsx
+++ b/src/modules/twap/containers/TwapConfirmModal/index.tsx
@@ -2,14 +2,16 @@ import { useAtomValue } from 'jotai'
 import { useState } from 'react'
 
 import { useAdvancedOrdersDerivedState } from 'modules/advancedOrders'
-import { TradeConfirmation, TradeConfirmModal, useTradeConfirmActions } from 'modules/trade'
+import { useTradePriceImpact, TradeConfirmation, TradeConfirmModal, useTradeConfirmActions } from 'modules/trade'
 import { TradeBasicConfirmDetails } from 'modules/trade/containers/TradeBasicConfirmDetails'
+import { NoImpactWarning } from 'modules/trade/pure/NoImpactWarning'
 
 import { useRateInfoParams } from 'common/hooks/useRateInfoParams'
 
 import { TwapConfirmDetails } from './TwapConfirmDetails'
 
 import { useCreateTwapOrder } from '../../hooks/useCreateTwapOrder'
+import { useTwapWarningsContext } from '../../hooks/useTwapWarningsContext'
 import { partsStateAtom } from '../../state/partsStateAtom'
 import { twapOrderAtom } from '../../state/twapOrderAtom'
 import { twapOrderSlippage } from '../../state/twapOrdersSettingsAtom'
@@ -31,6 +33,7 @@ export function TwapConfirmModal({ fallbackHandlerIsNotSet }: TwapConfirmModalPr
   const twapOrder = useAtomValue(twapOrderAtom)
   const slippage = useAtomValue(twapOrderSlippage)
   const partsState = useAtomValue(partsStateAtom)
+  const { showPriceImpactWarning } = useTwapWarningsContext()
 
   const tradeConfirmActions = useTradeConfirmActions()
   const createTwapOrder = useCreateTwapOrder()
@@ -40,12 +43,7 @@ export function TwapConfirmModal({ fallbackHandlerIsNotSet }: TwapConfirmModalPr
   // TODO: add conditions based on warnings
   const isConfirmDisabled = false
 
-  // TODO: define priceImpact
-  const priceImpact = {
-    priceImpact: undefined,
-    error: undefined,
-    loading: false,
-  }
+  const priceImpact = useTradePriceImpact()
 
   const inputCurrencyInfo = {
     amount: inputCurrencyAmount,
@@ -95,6 +93,7 @@ export function TwapConfirmModal({ fallbackHandlerIsNotSet }: TwapConfirmModalPr
             partsState={partsState}
             totalDuration={totalDuration}
           />
+          {showPriceImpactWarning && <NoImpactWarning withoutAccepting={true} isAccepted={true} />}
         </>
       </TradeConfirmation>
     </TradeConfirmModal>
diff --git a/src/modules/twap/containers/TwapFormWarnings/index.tsx b/src/modules/twap/containers/TwapFormWarnings/index.tsx
index f6d347659d..6b793ca2b1 100644
--- a/src/modules/twap/containers/TwapFormWarnings/index.tsx
+++ b/src/modules/twap/containers/TwapFormWarnings/index.tsx
@@ -2,6 +2,9 @@ import { useAtomValue } from 'jotai'
 import { useUpdateAtom } from 'jotai/utils'
 import { useCallback } from 'react'
 
+import { NoImpactWarning } from 'modules/trade/pure/NoImpactWarning'
+import { useIsSafeViaWc, useWalletInfo } from 'modules/wallet'
+
 import {
   FallbackHandlerWarning,
   SmallPartTimeWarning,
@@ -9,20 +12,24 @@ import {
   UnsupportedWalletWarning,
 } from './warnings'
 
-import { useIsSafeViaWc, useWalletInfo } from '../../../wallet'
-import { NEED_FALLBACK_HANDLER_STATES, TwapFormState } from '../../pure/PrimaryActionButton/getTwapFormState'
+import { useFallbackHandlerVerification } from '../../hooks/useFallbackHandlerVerification'
+import { useTwapWarningsContext } from '../../hooks/useTwapWarningsContext'
+import { TwapFormState } from '../../pure/PrimaryActionButton/getTwapFormState'
+import { ExtensibleFallbackVerification } from '../../services/verifyExtensibleFallback'
 import { twapOrdersSettingsAtom, updateTwapOrdersSettingsAtom } from '../../state/twapOrdersSettingsAtom'
 
 interface TwapFormWarningsProps {
   localFormValidation: TwapFormState | null
-  walletIsNotConnected: boolean
 }
 
-export function TwapFormWarnings({ localFormValidation, walletIsNotConnected }: TwapFormWarningsProps) {
-  const { isFallbackHandlerSetupAccepted } = useAtomValue(twapOrdersSettingsAtom)
+export function TwapFormWarnings({ localFormValidation }: TwapFormWarningsProps) {
+  const { isFallbackHandlerSetupAccepted, isPriceImpactAccepted } = useAtomValue(twapOrdersSettingsAtom)
   const updateTwapOrdersSettings = useUpdateAtom(updateTwapOrdersSettingsAtom)
-  const isSafeViaWc = useIsSafeViaWc()
+
   const { chainId } = useWalletInfo()
+  const fallbackHandlerVerification = useFallbackHandlerVerification()
+  const isSafeViaWc = useIsSafeViaWc()
+  const { canTrade, showPriceImpactWarning, walletIsNotConnected } = useTwapWarningsContext()
 
   const toggleFallbackHandlerSetupFlag = useCallback(
     (isFallbackHandlerSetupAccepted: boolean) => {
@@ -31,29 +38,47 @@ export function TwapFormWarnings({ localFormValidation, walletIsNotConnected }:
     [updateTwapOrdersSettings]
   )
 
+  const setIsPriceImpactAccepted = useCallback(() => {
+    updateTwapOrdersSettings({ isPriceImpactAccepted: !isPriceImpactAccepted })
+  }, [updateTwapOrdersSettings, isPriceImpactAccepted])
+
   // Don't display any warnings while a wallet is not connected
   if (walletIsNotConnected) return null
 
-  if (localFormValidation === TwapFormState.NOT_SAFE) {
-    return <UnsupportedWalletWarning isSafeViaWc={isSafeViaWc} />
-  }
+  return (
+    <>
+      {showPriceImpactWarning && (
+        <NoImpactWarning
+          withoutAccepting={false}
+          isAccepted={isPriceImpactAccepted}
+          acceptCallback={() => setIsPriceImpactAccepted()}
+        />
+      )}
+
+      {(() => {
+        if (localFormValidation === TwapFormState.NOT_SAFE) {
+          return <UnsupportedWalletWarning isSafeViaWc={isSafeViaWc} />
+        }
 
-  if (localFormValidation && NEED_FALLBACK_HANDLER_STATES.includes(localFormValidation)) {
-    return (
-      <FallbackHandlerWarning
-        isFallbackHandlerSetupAccepted={isFallbackHandlerSetupAccepted}
-        toggleFallbackHandlerSetupFlag={toggleFallbackHandlerSetupFlag}
-      />
-    )
-  }
+        if (chainId && localFormValidation === TwapFormState.SELL_AMOUNT_TOO_SMALL) {
+          return <SmallPartVolumeWarning chainId={chainId} />
+        }
 
-  if (chainId && localFormValidation === TwapFormState.SELL_AMOUNT_TOO_SMALL) {
-    return <SmallPartVolumeWarning chainId={chainId} />
-  }
+        if (localFormValidation === TwapFormState.PART_TIME_INTERVAL_TOO_SHORT) {
+          return <SmallPartTimeWarning />
+        }
 
-  if (localFormValidation === TwapFormState.PART_TIME_INTERVAL_TOO_SHORT) {
-    return <SmallPartTimeWarning />
-  }
+        if (canTrade && fallbackHandlerVerification !== ExtensibleFallbackVerification.HAS_DOMAIN_VERIFIER) {
+          return (
+            <FallbackHandlerWarning
+              isFallbackHandlerSetupAccepted={isFallbackHandlerSetupAccepted}
+              toggleFallbackHandlerSetupFlag={toggleFallbackHandlerSetupFlag}
+            />
+          )
+        }
 
-  return null
+        return null
+      })()}
+    </>
+  )
 }
diff --git a/src/modules/twap/containers/TwapFormWidget/index.tsx b/src/modules/twap/containers/TwapFormWidget/index.tsx
index 49bad11d24..0843b17efb 100644
--- a/src/modules/twap/containers/TwapFormWidget/index.tsx
+++ b/src/modules/twap/containers/TwapFormWidget/index.tsx
@@ -8,7 +8,7 @@ import { useIsWrapOrUnwrap } from 'modules/trade/hooks/useIsWrapOrUnwrap'
 import { useTradeState } from 'modules/trade/hooks/useTradeState'
 import { TradeNumberInput } from 'modules/trade/pure/TradeNumberInput'
 import { TradeTextBox } from 'modules/trade/pure/TradeTextBox'
-import { TradeFormValidation, useGetTradeFormValidation } from 'modules/tradeFormValidation'
+import { useGetTradeFormValidation } from 'modules/tradeFormValidation'
 import { QuoteObserverUpdater } from 'modules/twap/updaters/QuoteObserverUpdater'
 import { useIsSafeApp, useWalletInfo } from 'modules/wallet'
 
@@ -20,10 +20,11 @@ import { DEFAULT_TWAP_SLIPPAGE, defaultNumOfParts, orderDeadlines } from '../../
 import { useTwapFormState } from '../../hooks/useTwapFormState'
 import { AmountParts } from '../../pure/AmountParts'
 import { DeadlineSelector } from '../../pure/DeadlineSelector'
-import { NEED_FALLBACK_HANDLER_STATES } from '../../pure/PrimaryActionButton/getTwapFormState'
+import { TwapFormState } from '../../pure/PrimaryActionButton/getTwapFormState'
 import { partsStateAtom } from '../../state/partsStateAtom'
 import { twapTimeIntervalAtom } from '../../state/twapOrderAtom'
 import { twapOrdersSettingsAtom, updateTwapOrdersSettingsAtom } from '../../state/twapOrdersSettingsAtom'
+import { FallbackHandlerVerificationUpdater } from '../../updaters/FallbackHandlerVerificationUpdater'
 import { TwapOrdersUpdater } from '../../updaters/TwapOrdersUpdater'
 import { deadlinePartsDisplay } from '../../utils/deadlinePartsDisplay'
 import { ActionButtons } from '../ActionButtons'
@@ -58,8 +59,7 @@ export function TwapFormWidget() {
     isCustomDeadline,
   }
 
-  const walletIsNotConnected = primaryFormValidation === TradeFormValidation.WalletNotConnected
-  const fallbackHandlerIsNotSet = !!localFormValidation && NEED_FALLBACK_HANDLER_STATES.includes(localFormValidation)
+  const fallbackHandlerIsNotSet = localFormValidation === TwapFormState.NEED_FALLBACK_HANDLER
   const shouldLoadTwapOrders = !!(isSafeApp && chainId && account && composableCowContract)
 
   // Reset output amount when num of parts or input amount are changed
@@ -67,9 +67,16 @@ export function TwapFormWidget() {
     updateState?.({ outputCurrencyAmount: null })
   }, [updateState, numberOfPartsValue, rawInputCurrencyAmount])
 
+  // Reset warnings flags once on start
+  useEffect(() => {
+    updateSettingsState({ isFallbackHandlerSetupAccepted: false, isPriceImpactAccepted: false })
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [])
+
   return (
     <>
       <QuoteObserverUpdater />
+      <FallbackHandlerVerificationUpdater />
       {shouldLoadTwapOrders && (
         <TwapOrdersUpdater composableCowContract={composableCowContract} safeAddress={account} chainId={chainId} />
       )}
@@ -118,12 +125,8 @@ export function TwapFormWidget() {
         </TradeTextBox>
       </styledEl.DeadlineRow>
 
-      <TwapFormWarnings localFormValidation={localFormValidation} walletIsNotConnected={walletIsNotConnected} />
-      <ActionButtons
-        localFormValidation={localFormValidation}
-        primaryFormValidation={primaryFormValidation}
-        walletIsNotConnected={walletIsNotConnected}
-      />
+      <TwapFormWarnings localFormValidation={localFormValidation} />
+      <ActionButtons localFormValidation={localFormValidation} primaryFormValidation={primaryFormValidation} />
     </>
   )
 }
diff --git a/src/modules/twap/hooks/useCreateTwapOrder.ts b/src/modules/twap/hooks/useCreateTwapOrder.ts
index 231e24bc4f..75014392e2 100644
--- a/src/modules/twap/hooks/useCreateTwapOrder.ts
+++ b/src/modules/twap/hooks/useCreateTwapOrder.ts
@@ -8,11 +8,13 @@ import ms from 'ms.macro'
 import { Nullish } from 'types'
 
 import { useAdvancedOrdersDerivedState } from 'modules/advancedOrders'
-import { useTradeConfirmActions } from 'modules/trade'
+import { useTradeConfirmActions, useTradePriceImpact } from 'modules/trade'
 import { SwapFlowAnalyticsContext } from 'modules/trade/utils/analytics'
 import { tradeFlowAnalytics } from 'modules/trade/utils/analytics'
 import { useWalletInfo } from 'modules/wallet'
 
+import { useConfirmPriceImpactWithoutFee } from 'common/hooks/useConfirmPriceImpactWithoutFee'
+
 import { useExtensibleFallbackContext } from './useExtensibleFallbackContext'
 import { useTwapOrderCreationContext } from './useTwapOrderCreationContext'
 
@@ -39,6 +41,9 @@ export function useCreateTwapOrder() {
 
   const tradeConfirmActions = useTradeConfirmActions()
 
+  const { priceImpact } = useTradePriceImpact()
+  const { confirmPriceImpactWithoutFee } = useConfirmPriceImpactWithoutFee()
+
   return useCallback(
     async (fallbackHandlerIsNotSet: boolean) => {
       if (!chainId || !account) return
@@ -52,6 +57,12 @@ export function useCreateTwapOrder() {
       )
         return
 
+      const isPriceImpactConfirmed = await confirmPriceImpactWithoutFee(priceImpact)
+
+      if (!isPriceImpactConfirmed) {
+        return
+      }
+
       const pendingTrade = {
         inputAmount: inputCurrencyAmount,
         outputAmount: outputCurrencyAmount,
@@ -107,6 +118,8 @@ export function useCreateTwapOrder() {
       extensibleFallbackContext,
       addTwapOrderToList,
       safeAppsSdk,
+      confirmPriceImpactWithoutFee,
+      priceImpact,
     ]
   )
 }
diff --git a/src/modules/twap/hooks/useFallbackHandlerVerification.ts b/src/modules/twap/hooks/useFallbackHandlerVerification.ts
new file mode 100644
index 0000000000..d189b91d03
--- /dev/null
+++ b/src/modules/twap/hooks/useFallbackHandlerVerification.ts
@@ -0,0 +1,7 @@
+import { useAtomValue } from 'jotai/utils'
+
+import { fallbackHandlerVerificationAtom } from '../state/fallbackHandlerVerificationAtom'
+
+export function useFallbackHandlerVerification() {
+  return useAtomValue(fallbackHandlerVerificationAtom)
+}
diff --git a/src/modules/twap/hooks/useTwapFormState.ts b/src/modules/twap/hooks/useTwapFormState.ts
index 24a1633d30..1ed6eeb669 100644
--- a/src/modules/twap/hooks/useTwapFormState.ts
+++ b/src/modules/twap/hooks/useTwapFormState.ts
@@ -1,21 +1,16 @@
 import { useAtomValue } from 'jotai'
 import { useMemo } from 'react'
 
-import { useAsyncMemo } from 'use-async-memo'
-
 import { useIsSafeApp, useWalletInfo } from 'modules/wallet'
 
-import { useExtensibleFallbackContext } from './useExtensibleFallbackContext'
+import { useFallbackHandlerVerification } from './useFallbackHandlerVerification'
 
 import { getTwapFormState, TwapFormState } from '../pure/PrimaryActionButton/getTwapFormState'
-import { verifyExtensibleFallback } from '../services/verifyExtensibleFallback'
 import { partsStateAtom } from '../state/partsStateAtom'
 import { twapOrderAtom, twapTimeIntervalAtom } from '../state/twapOrderAtom'
 import { twapOrdersSettingsAtom } from '../state/twapOrdersSettingsAtom'
 
 export function useTwapFormState(): TwapFormState | null {
-  const isSafeApp = useIsSafeApp()
-  const extensibleFallbackContext = useExtensibleFallbackContext()
   const { isFallbackHandlerSetupAccepted } = useAtomValue(twapOrdersSettingsAtom)
   const { chainId } = useWalletInfo()
 
@@ -23,11 +18,8 @@ export function useTwapFormState(): TwapFormState | null {
   const { inputFiatAmount: sellAmountPartFiat } = useAtomValue(partsStateAtom)
   const partTime = useAtomValue(twapTimeIntervalAtom)
 
-  const verification = useAsyncMemo(
-    () => (extensibleFallbackContext ? verifyExtensibleFallback(extensibleFallbackContext) : null),
-    [extensibleFallbackContext],
-    null
-  )
+  const verification = useFallbackHandlerVerification()
+  const isSafeApp = useIsSafeApp()
 
   return useMemo(() => {
     return getTwapFormState({
diff --git a/src/modules/twap/hooks/useTwapWarningsContext.ts b/src/modules/twap/hooks/useTwapWarningsContext.ts
new file mode 100644
index 0000000000..d64afeb567
--- /dev/null
+++ b/src/modules/twap/hooks/useTwapWarningsContext.ts
@@ -0,0 +1,29 @@
+import { useMemo } from 'react'
+
+import { useTradePriceImpact } from 'modules/trade'
+import { TradeFormValidation, useGetTradeFormValidation } from 'modules/tradeFormValidation'
+
+export interface TwapWarningsContext {
+  canTrade: boolean
+  showPriceImpactWarning: boolean
+  walletIsNotConnected: boolean
+}
+
+export function useTwapWarningsContext(): TwapWarningsContext {
+  const primaryFormValidation = useGetTradeFormValidation()
+  const priceImpact = useTradePriceImpact()
+
+  return useMemo(() => {
+    // TODO: bind to settings
+    const expertMode = false
+    const canTrade = !primaryFormValidation
+    const showPriceImpactWarning = canTrade && !expertMode && !!priceImpact.error
+    const walletIsNotConnected = primaryFormValidation === TradeFormValidation.WalletNotConnected
+
+    return {
+      canTrade,
+      showPriceImpactWarning,
+      walletIsNotConnected,
+    }
+  }, [priceImpact, primaryFormValidation])
+}
diff --git a/src/modules/twap/pure/PrimaryActionButton/getTwapFormState.tsx b/src/modules/twap/pure/PrimaryActionButton/getTwapFormState.tsx
index 9b08c8ee3e..191a629d88 100644
--- a/src/modules/twap/pure/PrimaryActionButton/getTwapFormState.tsx
+++ b/src/modules/twap/pure/PrimaryActionButton/getTwapFormState.tsx
@@ -22,16 +22,10 @@ export enum TwapFormState {
   LOADING_SAFE_INFO = 'LOADING_SAFE_INFO',
   NOT_SAFE = 'NOT_SAFE',
   NEED_FALLBACK_HANDLER = 'NEED_FALLBACK_HANDLER',
-  ACCEPTED_FALLBACK_HANDLER_SETUP = 'ACCEPTED_FALLBACK_HANDLER_SETUP',
   SELL_AMOUNT_TOO_SMALL = 'SELL_AMOUNT_TOO_SMALL',
   PART_TIME_INTERVAL_TOO_SHORT = 'PART_TIME_INTERVAL_TOO_SHORT',
 }
 
-export const NEED_FALLBACK_HANDLER_STATES = [
-  TwapFormState.NEED_FALLBACK_HANDLER,
-  TwapFormState.ACCEPTED_FALLBACK_HANDLER_SETUP,
-]
-
 export function getTwapFormState(props: TwapFormStateParams): TwapFormState | null {
   const { twapOrder, isSafeApp, isFallbackHandlerSetupAccepted, verification, sellAmountPartFiat, chainId, partTime } =
     props
@@ -40,11 +34,11 @@ export function getTwapFormState(props: TwapFormStateParams): TwapFormState | nu
 
   if (verification === null) return TwapFormState.LOADING_SAFE_INFO
 
-  if (twapOrder && verification !== ExtensibleFallbackVerification.HAS_DOMAIN_VERIFIER) {
-    if (isFallbackHandlerSetupAccepted) {
-      return TwapFormState.ACCEPTED_FALLBACK_HANDLER_SETUP
-    }
-
+  if (
+    twapOrder &&
+    verification !== ExtensibleFallbackVerification.HAS_DOMAIN_VERIFIER &&
+    !isFallbackHandlerSetupAccepted
+  ) {
     return TwapFormState.NEED_FALLBACK_HANDLER
   }
 
diff --git a/src/modules/twap/pure/PrimaryActionButton/index.tsx b/src/modules/twap/pure/PrimaryActionButton/index.tsx
index 7d61ce99cb..8521e33f0b 100644
--- a/src/modules/twap/pure/PrimaryActionButton/index.tsx
+++ b/src/modules/twap/pure/PrimaryActionButton/index.tsx
@@ -25,11 +25,6 @@ const buttonsMap: Record<TwapFormState, (context: PrimaryActionButtonContext) =>
       Unsupported Safe
     </ButtonPrimary>
   ),
-  [TwapFormState.ACCEPTED_FALLBACK_HANDLER_SETUP]: ({ confirmTrade }: PrimaryActionButtonContext) => (
-    <ButtonPrimary buttonSize={ButtonSize.BIG} onClick={confirmTrade}>
-      Review TWAP order
-    </ButtonPrimary>
-  ),
   [TwapFormState.SELL_AMOUNT_TOO_SMALL]: () => (
     <ButtonPrimary disabled={true} buttonSize={ButtonSize.BIG}>
       Sell amount too small
diff --git a/src/modules/twap/state/fallbackHandlerVerificationAtom.ts b/src/modules/twap/state/fallbackHandlerVerificationAtom.ts
new file mode 100644
index 0000000000..8a00251780
--- /dev/null
+++ b/src/modules/twap/state/fallbackHandlerVerificationAtom.ts
@@ -0,0 +1,5 @@
+import { atom } from 'jotai'
+
+import { ExtensibleFallbackVerification } from '../services/verifyExtensibleFallback'
+
+export const fallbackHandlerVerificationAtom = atom<ExtensibleFallbackVerification | null>(null)
diff --git a/src/modules/twap/state/twapOrdersSettingsAtom.ts b/src/modules/twap/state/twapOrdersSettingsAtom.ts
index 0a0af68e16..1b0088a55f 100644
--- a/src/modules/twap/state/twapOrdersSettingsAtom.ts
+++ b/src/modules/twap/state/twapOrdersSettingsAtom.ts
@@ -20,6 +20,7 @@ export interface TwapOrdersSettingsState extends TwapOrdersDeadline {
   readonly numberOfPartsValue: number
   readonly slippageValue: number | null
   readonly isFallbackHandlerSetupAccepted: boolean
+  readonly isPriceImpactAccepted: boolean
 }
 
 export const defaultCustomDeadline: TwapOrdersDeadline['customDeadline'] = {
@@ -36,6 +37,7 @@ export const defaultTwapOrdersSettings: TwapOrdersSettingsState = {
   // null = auto
   slippageValue: null,
   isFallbackHandlerSetupAccepted: false,
+  isPriceImpactAccepted: false,
 }
 
 export const twapOrdersSettingsAtom = atomWithStorage<TwapOrdersSettingsState>(
diff --git a/src/modules/twap/updaters/FallbackHandlerVerificationUpdater.tsx b/src/modules/twap/updaters/FallbackHandlerVerificationUpdater.tsx
new file mode 100644
index 0000000000..5049521c8c
--- /dev/null
+++ b/src/modules/twap/updaters/FallbackHandlerVerificationUpdater.tsx
@@ -0,0 +1,25 @@
+import { useUpdateAtom } from 'jotai/utils'
+import { useEffect } from 'react'
+
+import { useAsyncMemo } from 'use-async-memo'
+
+import { useExtensibleFallbackContext } from '../hooks/useExtensibleFallbackContext'
+import { verifyExtensibleFallback } from '../services/verifyExtensibleFallback'
+import { fallbackHandlerVerificationAtom } from '../state/fallbackHandlerVerificationAtom'
+
+export function FallbackHandlerVerificationUpdater() {
+  const update = useUpdateAtom(fallbackHandlerVerificationAtom)
+
+  const extensibleFallbackContext = useExtensibleFallbackContext()
+  const fallbackHandlerVerification = useAsyncMemo(
+    () => (extensibleFallbackContext ? verifyExtensibleFallback(extensibleFallbackContext) : null),
+    [extensibleFallbackContext],
+    null
+  )
+
+  useEffect(() => {
+    update(fallbackHandlerVerification)
+  }, [fallbackHandlerVerification, update])
+
+  return null
+}

From 013f7ef07146c01adbd32a1013ba94c0e8f67b5f Mon Sep 17 00:00:00 2001
From: Alexandr Kazachenko <shoom3301@gmail.com>
Date: Mon, 26 Jun 2023 15:25:32 +0600
Subject: [PATCH 32/67] docs(injected-widget): documentation (#2719)

---
 src/libs/widget-lib/docs/README.md            | 175 ++++++++++++++++++
 src/libs/widget-lib/docs/demo-preview.png     | Bin 0 -> 108797 bytes
 .../updaters/InjectedWidgetUpdater.ts         |   8 +-
 3 files changed, 182 insertions(+), 1 deletion(-)
 create mode 100644 src/libs/widget-lib/docs/README.md
 create mode 100644 src/libs/widget-lib/docs/demo-preview.png

diff --git a/src/libs/widget-lib/docs/README.md b/src/libs/widget-lib/docs/README.md
new file mode 100644
index 0000000000..85282de358
--- /dev/null
+++ b/src/libs/widget-lib/docs/README.md
@@ -0,0 +1,175 @@
+# CowSwap Widget
+
+Integrate the power of `CowSwap` into your product!
+With the widget, you can create an incredible trading interface. Specify the required pair of currencies, customize the
+look and much more!
+
+[![Demo](./demo-preview.png)](https://www.youtube.com/watch?v=gxRRH9Rumx4&ab_channel=CoWSwap)
+
+> [Watch the demo](https://www.youtube.com/watch?v=gxRRH9Rumx4&ab_channel=CoWSwap)
+
+## Install
+
+```bash
+yarn add @cowprotocol/widget-lib
+```
+
+```bash
+npm install @cowprotocol/widget-lib
+```
+
+## Quick start
+
+```typescript
+import { cowSwapWidget, CowSwapWidgetParams, CowSwapWidgetSettings } from '@cowprotocol/widget-lib'
+
+// Initialise the widget
+const widgetContainer = document.getElementById('cowswap-widget')
+
+const params: CowSwapWidgetParams = {
+  container: widgetContainer,
+  width: 600,
+  height: 640,
+}
+
+const settings: CowSwapWidgetSettings = {
+  urlParams: {
+    sell: { asset: 'DAI' },
+    buy: { asset: 'USDC', amount: '0.1' }
+  }
+}
+
+cowSwapWidget(params, settings)
+```
+
+## Wallet provider
+
+You can pass the wallet provider from your application to seamlessly use the widget as part of your application.
+Also, you can not specify the provider, in this case the widget will work in standalone mode with the ability to connect any wallet supported in CowSwap.
+
+A provider must comply with [EIP-1193](https://eips.ethereum.org/EIPS/eip-11930) and implement the interface:
+```typescript
+interface EthereumProvider {
+  on(event: string, args: unknown): void
+  request<T>(params: JsonRpcRequest): Promise<T>
+  enable(): Promise<void>
+}
+
+interface JsonRpcRequest {
+  id: number
+  method: string
+  params: unknown[]
+}
+```
+
+An example of connecting a widget to Metamask:
+
+```typescript
+import { cowSwapWidget, CowSwapWidgetParams } from '@cowprotocol/widget-lib'
+
+const params: CowSwapWidgetParams = {
+  container: document.getElementById('cowswap-widget'),
+  width: 600,
+  height: 640,
+  provider: window.ethereum // <-------
+}
+
+cowSwapWidget(params, {})
+```
+
+## Configuration
+
+### `CowSwapWidgetParams`
+
+| Parameter   | Type               | Description                                                                |
+|-------------|--------------------|----------------------------------------------------------------------------|
+| `width`     | `number`           | The width of the widget in pixels.                                         |
+| `height`    | `number`           | The height of the widget in pixels.                                        |
+| `container` | `HTMLElement`      | The container in which the widget will be displayed.                       |
+| `provider`  | `EthereumProvider` | (Optional) The Ethereum provider to be used for interacting with a wallet. |
+
+### `CowSwapWidgetSettings`
+
+| Parameter   | Type                     | Description                                                                                                                     |
+|-------------|--------------------------|---------------------------------------------------------------------------------------------------------------------------------|
+| `urlParams` | `CowSwapWidgetUrlParams` | The URL parameters of the widget, including chain information, trade type, environment, assets, and theme.                      |
+| `appParams` | `CowSwapWidgetAppParams` | (Optional) The application parameters of the widget, including the logo URL and flags for hiding the logo and network selector. |
+
+### `CowSwapWidgetUrlParams`
+
+| Parameter     | Type               | Description                                                                                            |
+|---------------|--------------------|--------------------------------------------------------------------------------------------------------|
+| `chainId`     | `number`           | The blockchain ID on which the trade will take place.                                                  |
+| `tradeType`   | `string`           | The type of trade. Can be `swap` or `limit-orders`.                                                    |
+| `env`         | `CowSwapWidgetEnv` | The environment of the widget (`'local'` or `'prod'`). |
+| `theme`       | `CowSwapTheme`     | (Optional) The theme of the widget (`'dark'` for dark theme or `'light'` for light theme).             |
+| `tradeAssets` | `TradeAssets`      | (Optional) An object containing information about the selling and buying assets.                       |
+
+```typescript
+interface TradeAsset {
+  asset: string
+  amount?: string
+}
+
+export interface TradeAssets {
+  sell: TradeAsset
+  buy: TradeAsset
+}
+```
+
+### `CowSwapWidgetAppParams`
+
+| Parameter             | Type               | Description                                                                      |
+|-----------------------|--------------------|----------------------------------------------------------------------------------|
+| `logoUrl`             | `boolean`          | The width of the widget in pixels.                                               |
+| `hideLogo`            | `boolean`          | The height of the widget in pixels.                                              |
+| `hideNetworkSelector` | `boolean`          | The container in which the widget will be displayed.                             |
+
+
+## Widget updating
+
+You can change all possible widget options on the fly:
+
+```typescript
+import { cowSwapWidget, CowSwapWidgetParams, CowSwapWidgetSettings } from '@cowprotocol/widget-lib'
+
+const params: CowSwapWidgetParams = {
+  container: document.getElementById('cowswap-widget'),
+  width: 600,
+  height: 640,
+}
+
+
+const settings: CowSwapWidgetSettings = {
+  appParams: {
+    logoUrl: 'YOUR_LOGO_URL'
+  }
+}
+
+const updateWidget = cowSwapWidget(params, settings)
+
+// Update the widget
+updateWidget({
+  urlParams: {
+    theme: 'dark', // <- Change theme to dark
+  },
+  appParams: {
+    ...settings.appParams,
+    hideNetworkSelector: true // <- Hide the network selector
+  },
+})
+```
+
+## Widget URL
+
+Most of the widget parameters are controlled via the URL, which means that you can create the URL yourself and embed the iframe.
+An example of URL:
+```
+https://swap.cow.fi/#/100/swap/WXDAI/GNO?sellAmount=200&theme=dark
+```
+
+
+## Backlog
+1. [ ] Customizing the theme palette
+2. [ ] Set custom tokens list from URL or JSON
+3. [ ] Forward integrator meta-data to Appzi
diff --git a/src/libs/widget-lib/docs/demo-preview.png b/src/libs/widget-lib/docs/demo-preview.png
new file mode 100644
index 0000000000000000000000000000000000000000..108d4c55512593a57eabc7fc17272b5298fc1073
GIT binary patch
literal 108797
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
C%_kxN

literal 0
HcmV?d00001

diff --git a/src/modules/injectedWidget/updaters/InjectedWidgetUpdater.ts b/src/modules/injectedWidget/updaters/InjectedWidgetUpdater.ts
index d6742e5bb9..b3be2dff49 100644
--- a/src/modules/injectedWidget/updaters/InjectedWidgetUpdater.ts
+++ b/src/modules/injectedWidget/updaters/InjectedWidgetUpdater.ts
@@ -1,8 +1,10 @@
 import { useUpdateAtom } from 'jotai/utils'
-import { useEffect } from 'react'
+import { useEffect, useRef } from 'react'
 
 import { useNavigate } from 'react-router-dom'
 
+import { deepEqual } from 'utils/deepEqual'
+
 import { injectedWidgetParamsAtom } from '../state/injectedWidgetParamsAtom'
 
 const COW_SWAP_WIDGET_EVENT_KEY = 'cowSwapWidget'
@@ -10,6 +12,7 @@ const COW_SWAP_WIDGET_EVENT_KEY = 'cowSwapWidget'
 export function InjectedWidgetUpdater() {
   const updateParams = useUpdateAtom(injectedWidgetParamsAtom)
   const navigate = useNavigate()
+  const prevData = useRef(null)
 
   useEffect(() => {
     window.addEventListener('message', (event) => {
@@ -18,6 +21,9 @@ export function InjectedWidgetUpdater() {
       if (event.data.key !== COW_SWAP_WIDGET_EVENT_KEY || !method) return
 
       if (method === 'update') {
+        if (prevData.current && deepEqual(prevData.current, event.data)) return
+
+        prevData.current = event.data
         updateParams(event.data.appParams)
         navigate(event.data.urlParams)
       }

From b7a1cc9b1be9fb5d143eb01b837d221bc75f4c74 Mon Sep 17 00:00:00 2001
From: Alexandr Kazachenko <shoom3301@gmail.com>
Date: Mon, 26 Jun 2023 17:32:20 +0600
Subject: [PATCH 33/67] feat(injected-widget): set app-data appCode from
 integrator (#2721)

---
 src/libs/widget-lib/docs/README.md            | 53 +++++++-----
 src/libs/widget-lib/src/cowSwapWidget.ts      | 41 +++++++---
 src/libs/widget-lib/src/demo/index.ts         |  4 +
 src/libs/widget-lib/src/types.ts              |  6 ++
 src/modules/appData/hooks.ts                  | 24 ++++--
 .../appData/updater/useAppDataUpdater.ts      |  2 +-
 .../state/injectedWidgetMetaDataAtom.ts       |  8 ++
 .../updaters/InjectedWidgetUpdater.ts         | 80 ++++++++++++++++---
 8 files changed, 167 insertions(+), 51 deletions(-)
 create mode 100644 src/modules/injectedWidget/state/injectedWidgetMetaDataAtom.ts

diff --git a/src/libs/widget-lib/docs/README.md b/src/libs/widget-lib/docs/README.md
index 85282de358..57860a98de 100644
--- a/src/libs/widget-lib/docs/README.md
+++ b/src/libs/widget-lib/docs/README.md
@@ -28,6 +28,7 @@ const widgetContainer = document.getElementById('cowswap-widget')
 
 const params: CowSwapWidgetParams = {
   container: widgetContainer,
+  metaData: { appKey: 'YOUR_APP_ID', url: 'https://YOUR_APP_URL' },
   width: 600,
   height: 640,
 }
@@ -45,13 +46,17 @@ cowSwapWidget(params, settings)
 ## Wallet provider
 
 You can pass the wallet provider from your application to seamlessly use the widget as part of your application.
-Also, you can not specify the provider, in this case the widget will work in standalone mode with the ability to connect any wallet supported in CowSwap.
+Also, you can not specify the provider, in this case the widget will work in standalone mode with the ability to connect
+any wallet supported in CowSwap.
 
 A provider must comply with [EIP-1193](https://eips.ethereum.org/EIPS/eip-11930) and implement the interface:
+
 ```typescript
 interface EthereumProvider {
   on(event: string, args: unknown): void
+
   request<T>(params: JsonRpcRequest): Promise<T>
+
   enable(): Promise<void>
 }
 
@@ -69,6 +74,7 @@ import { cowSwapWidget, CowSwapWidgetParams } from '@cowprotocol/widget-lib'
 
 const params: CowSwapWidgetParams = {
   container: document.getElementById('cowswap-widget'),
+  metaData: { appKey: 'YOUR_APP_ID', url: 'https://YOUR_APP_URL' },
   width: 600,
   height: 640,
   provider: window.ethereum // <-------
@@ -81,12 +87,13 @@ cowSwapWidget(params, {})
 
 ### `CowSwapWidgetParams`
 
-| Parameter   | Type               | Description                                                                |
-|-------------|--------------------|----------------------------------------------------------------------------|
-| `width`     | `number`           | The width of the widget in pixels.                                         |
-| `height`    | `number`           | The height of the widget in pixels.                                        |
-| `container` | `HTMLElement`      | The container in which the widget will be displayed.                       |
-| `provider`  | `EthereumProvider` | (Optional) The Ethereum provider to be used for interacting with a wallet. |
+| Parameter   | Type                    | Description                                                                                                                                          |
+|-------------|-------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `width`     | `number`                | The width of the widget in pixels.                                                                                                                   |
+| `height`    | `number`                | The height of the widget in pixels.                                                                                                                  |
+| `container` | `HTMLElement`           | The container in which the widget will be displayed.                                                                                                 |
+| `metaData`  | `CowSwapWidgetMetaData` | Information about the application in which the widget is embedded. This information will help identify the source of orders and requests from users. |
+| `provider`  | `EthereumProvider`      | (Optional) The Ethereum provider to be used for interacting with a wallet.                                                                           |
 
 ### `CowSwapWidgetSettings`
 
@@ -97,13 +104,13 @@ cowSwapWidget(params, {})
 
 ### `CowSwapWidgetUrlParams`
 
-| Parameter     | Type               | Description                                                                                            |
-|---------------|--------------------|--------------------------------------------------------------------------------------------------------|
-| `chainId`     | `number`           | The blockchain ID on which the trade will take place.                                                  |
-| `tradeType`   | `string`           | The type of trade. Can be `swap` or `limit-orders`.                                                    |
-| `env`         | `CowSwapWidgetEnv` | The environment of the widget (`'local'` or `'prod'`). |
-| `theme`       | `CowSwapTheme`     | (Optional) The theme of the widget (`'dark'` for dark theme or `'light'` for light theme).             |
-| `tradeAssets` | `TradeAssets`      | (Optional) An object containing information about the selling and buying assets.                       |
+| Parameter     | Type               | Description                                                                                |
+|---------------|--------------------|--------------------------------------------------------------------------------------------|
+| `chainId`     | `number`           | The blockchain ID on which the trade will take place.                                      |
+| `tradeType`   | `string`           | The type of trade. Can be `swap` or `limit-orders`.                                        |
+| `env`         | `CowSwapWidgetEnv` | The environment of the widget (`'local'` or `'prod'`).                                     |
+| `theme`       | `CowSwapTheme`     | (Optional) The theme of the widget (`'dark'` for dark theme or `'light'` for light theme). |
+| `tradeAssets` | `TradeAssets`      | (Optional) An object containing information about the selling and buying assets.           |
 
 ```typescript
 interface TradeAsset {
@@ -119,12 +126,11 @@ export interface TradeAssets {
 
 ### `CowSwapWidgetAppParams`
 
-| Parameter             | Type               | Description                                                                      |
-|-----------------------|--------------------|----------------------------------------------------------------------------------|
-| `logoUrl`             | `boolean`          | The width of the widget in pixels.                                               |
-| `hideLogo`            | `boolean`          | The height of the widget in pixels.                                              |
-| `hideNetworkSelector` | `boolean`          | The container in which the widget will be displayed.                             |
-
+| Parameter             | Type      | Description                                          |
+|-----------------------|-----------|------------------------------------------------------|
+| `logoUrl`             | `boolean` | The width of the widget in pixels.                   |
+| `hideLogo`            | `boolean` | The height of the widget in pixels.                  |
+| `hideNetworkSelector` | `boolean` | The container in which the widget will be displayed. |
 
 ## Widget updating
 
@@ -135,6 +141,7 @@ import { cowSwapWidget, CowSwapWidgetParams, CowSwapWidgetSettings } from '@cowp
 
 const params: CowSwapWidgetParams = {
   container: document.getElementById('cowswap-widget'),
+  metaData: { appKey: 'YOUR_APP_ID', url: 'https://YOUR_APP_URL' },
   width: 600,
   height: 640,
 }
@@ -162,14 +169,16 @@ updateWidget({
 
 ## Widget URL
 
-Most of the widget parameters are controlled via the URL, which means that you can create the URL yourself and embed the iframe.
+Most of the widget parameters are controlled via the URL, which means that you can create the URL yourself and embed the
+iframe.
 An example of URL:
+
 ```
 https://swap.cow.fi/#/100/swap/WXDAI/GNO?sellAmount=200&theme=dark
 ```
 
-
 ## Backlog
+
 1. [ ] Customizing the theme palette
 2. [ ] Set custom tokens list from URL or JSON
 3. [ ] Forward integrator meta-data to Appzi
diff --git a/src/libs/widget-lib/src/cowSwapWidget.ts b/src/libs/widget-lib/src/cowSwapWidget.ts
index 301a47461f..66e6ad9f04 100644
--- a/src/libs/widget-lib/src/cowSwapWidget.ts
+++ b/src/libs/widget-lib/src/cowSwapWidget.ts
@@ -1,5 +1,5 @@
 import { JsonRpcManager } from './JsonRpcManager'
-import { CowSwapWidgetParams, CowSwapWidgetSettings } from './types'
+import { CowSwapWidgetMetaData, CowSwapWidgetParams, CowSwapWidgetSettings } from './types'
 import { buildTradeAmountsQuery, buildWidgetPath, buildWidgetUrl } from './urlUtils'
 
 const COW_SWAP_WIDGET_EVENT_KEY = 'cowSwapWidget'
@@ -17,6 +17,8 @@ export function cowSwapWidget(params: CowSwapWidgetParams, settings: CowSwapWidg
 
   if (!contentWindow) throw new Error('Iframe does not contain a window!')
 
+  sendMetaData(contentWindow, params.metaData)
+
   if (provider) {
     const jsonRpcManager = new JsonRpcManager(contentWindow)
 
@@ -26,6 +28,19 @@ export function cowSwapWidget(params: CowSwapWidgetParams, settings: CowSwapWidg
   return (params: CowSwapWidgetSettings) => updateWidget(params, contentWindow)
 }
 
+function createIframe(params: CowSwapWidgetParams, settings: CowSwapWidgetSettings): HTMLIFrameElement {
+  const { width, height } = params
+
+  const iframe = document.createElement('iframe')
+
+  iframe.src = buildWidgetUrl(settings.urlParams)
+  iframe.width = `${width}px`
+  iframe.height = `${height}px`
+  iframe.style.border = '0'
+
+  return iframe
+}
+
 function updateWidget(params: CowSwapWidgetSettings, contentWindow: Window) {
   const pathname = buildWidgetPath(params.urlParams)
   const search = buildTradeAmountsQuery(params.urlParams).toString()
@@ -44,15 +59,19 @@ function updateWidget(params: CowSwapWidgetSettings, contentWindow: Window) {
   )
 }
 
-function createIframe(params: CowSwapWidgetParams, settings: CowSwapWidgetSettings): HTMLIFrameElement {
-  const { width, height } = params
-
-  const iframe = document.createElement('iframe')
-
-  iframe.src = buildWidgetUrl(settings.urlParams)
-  iframe.width = `${width}px`
-  iframe.height = `${height}px`
-  iframe.style.border = '0'
+function sendMetaData(contentWindow: Window, metaData: CowSwapWidgetMetaData) {
+  window.addEventListener('message', (event) => {
+    if (event.data.key !== COW_SWAP_WIDGET_EVENT_KEY || event.data.method !== 'activate') {
+      return
+    }
 
-  return iframe
+    contentWindow.postMessage(
+      {
+        key: COW_SWAP_WIDGET_EVENT_KEY,
+        method: 'metaData',
+        metaData,
+      },
+      '*'
+    )
+  })
 }
diff --git a/src/libs/widget-lib/src/demo/index.ts b/src/libs/widget-lib/src/demo/index.ts
index 63c6697953..13239160e4 100644
--- a/src/libs/widget-lib/src/demo/index.ts
+++ b/src/libs/widget-lib/src/demo/index.ts
@@ -29,6 +29,10 @@ function init(provider?: EthereumProvider) {
       height: 640,
       container: document.getElementById('widgetContainer') as HTMLElement,
       provider,
+      metaData: {
+        appKey: 'CowSwapWidgetDemoApp',
+        url: 'https://swap.cow.fi/assets/injected-widget/',
+      },
     },
     { urlParams, appParams }
   )
diff --git a/src/libs/widget-lib/src/types.ts b/src/libs/widget-lib/src/types.ts
index 10f6257dcd..030974ccd9 100644
--- a/src/libs/widget-lib/src/types.ts
+++ b/src/libs/widget-lib/src/types.ts
@@ -44,9 +44,15 @@ export interface CowSwapWidgetSettings {
   appParams: CowSwapWidgetAppParams
 }
 
+export interface CowSwapWidgetMetaData {
+  appKey: string
+  url: string
+}
+
 export interface CowSwapWidgetParams {
   width: number
   height: number
   container: HTMLElement
+  metaData: CowSwapWidgetMetaData
   provider?: EthereumProvider
 }
diff --git a/src/modules/appData/hooks.ts b/src/modules/appData/hooks.ts
index e9d17f1a39..7d25913540 100644
--- a/src/modules/appData/hooks.ts
+++ b/src/modules/appData/hooks.ts
@@ -1,12 +1,17 @@
 import { useAtomValue, useUpdateAtom } from 'jotai/utils'
+import { useMemo } from 'react'
 
 import { DEFAULT_APP_CODE, SAFE_APP_CODE } from 'legacy/constants'
 
 import { useIsSafeApp } from 'modules/wallet'
 
+import { isInjectedWidget } from 'common/utils/isInjectedWidget'
+
 import { addAppDataToUploadQueueAtom, appDataInfoAtom } from './state/atoms'
 import { AppDataInfo } from './types'
 
+import { injectedWidgetMetaDataAtom } from '../injectedWidget/state/injectedWidgetMetaDataAtom'
+
 const APP_CODE = process.env.REACT_APP_APP_CODE
 
 export function useUploadAppData() {
@@ -17,13 +22,20 @@ export function useAppData(): AppDataInfo | null {
   return useAtomValue(appDataInfoAtom)
 }
 
-export function useAppCode(): string {
+export function useAppCode(): string | null {
+  const injectedWidgetMetaData = useAtomValue(injectedWidgetMetaDataAtom)
   const isSafeApp = useIsSafeApp()
 
-  if (APP_CODE) {
-    // appCode coming from env var has priority
-    return APP_CODE
-  }
+  return useMemo(() => {
+    if (isInjectedWidget()) {
+      return injectedWidgetMetaData?.appKey || null
+    }
+
+    if (APP_CODE) {
+      // appCode coming from env var has priority
+      return APP_CODE
+    }
 
-  return isSafeApp ? SAFE_APP_CODE : DEFAULT_APP_CODE
+    return isSafeApp ? SAFE_APP_CODE : DEFAULT_APP_CODE
+  }, [isSafeApp, injectedWidgetMetaData])
 }
diff --git a/src/modules/appData/updater/useAppDataUpdater.ts b/src/modules/appData/updater/useAppDataUpdater.ts
index 4f8ea2d438..2999555ac2 100644
--- a/src/modules/appData/updater/useAppDataUpdater.ts
+++ b/src/modules/appData/updater/useAppDataUpdater.ts
@@ -29,7 +29,7 @@ export function useAppDataUpdater({ chainId, slippageBips, orderClass, utm }: Us
   const appCode = useAppCode()
 
   useEffect(() => {
-    if (!chainId) {
+    if (!chainId || !appCode) {
       // reset values when there is no price estimation or network changes
       setAppDataInfo(null)
       return
diff --git a/src/modules/injectedWidget/state/injectedWidgetMetaDataAtom.ts b/src/modules/injectedWidget/state/injectedWidgetMetaDataAtom.ts
new file mode 100644
index 0000000000..a03015f207
--- /dev/null
+++ b/src/modules/injectedWidget/state/injectedWidgetMetaDataAtom.ts
@@ -0,0 +1,8 @@
+import { atom } from 'jotai'
+
+export interface InjectedWidgetMetaData {
+  appKey: string
+  url: string
+}
+
+export const injectedWidgetMetaDataAtom = atom<InjectedWidgetMetaData | null>(null)
diff --git a/src/modules/injectedWidget/updaters/InjectedWidgetUpdater.ts b/src/modules/injectedWidget/updaters/InjectedWidgetUpdater.ts
index b3be2dff49..6a272e567e 100644
--- a/src/modules/injectedWidget/updaters/InjectedWidgetUpdater.ts
+++ b/src/modules/injectedWidget/updaters/InjectedWidgetUpdater.ts
@@ -1,34 +1,92 @@
 import { useUpdateAtom } from 'jotai/utils'
-import { useEffect, useRef } from 'react'
+import { useCallback, useEffect, useRef } from 'react'
 
 import { useNavigate } from 'react-router-dom'
 
 import { deepEqual } from 'utils/deepEqual'
 
+import { injectedWidgetMetaDataAtom } from '../state/injectedWidgetMetaDataAtom'
 import { injectedWidgetParamsAtom } from '../state/injectedWidgetParamsAtom'
 
 const COW_SWAP_WIDGET_EVENT_KEY = 'cowSwapWidget'
 
+const messagesCache: { [method: string]: unknown } = {}
+
+const getEventMethod = (event: MessageEvent) =>
+  (event.data.key === COW_SWAP_WIDGET_EVENT_KEY && (event.data.method as string)) || null
+
+const cacheMessages = (event: MessageEvent) => {
+  const method = getEventMethod(event)
+
+  if (!method) return
+
+  messagesCache[method] = event.data
+}
+
+/**
+ * To avoid delays, immediately send an activation message and start listening messages
+ */
+;(function initInjectedWidget() {
+  const isInIframe = window.top !== window.self
+
+  if (!window.top || !isInIframe) return
+
+  window.addEventListener('message', cacheMessages)
+
+  window.top.postMessage(
+    {
+      key: COW_SWAP_WIDGET_EVENT_KEY,
+      method: 'activate',
+    },
+    '*'
+  )
+})()
+
 export function InjectedWidgetUpdater() {
   const updateParams = useUpdateAtom(injectedWidgetParamsAtom)
+  const updateMetaData = useUpdateAtom(injectedWidgetMetaDataAtom)
   const navigate = useNavigate()
   const prevData = useRef(null)
 
+  const processEvent = useCallback(
+    (method: string, data: any) => {
+      if (method === 'update') {
+        if (prevData.current && deepEqual(prevData.current, data)) return
+
+        prevData.current = data
+        updateParams(data.appParams)
+        navigate(data.urlParams)
+      }
+
+      if (method === 'metaData') {
+        updateMetaData(data.metaData)
+      }
+    },
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    []
+  )
+
+  // Once app is loaded
   useEffect(() => {
-    window.addEventListener('message', (event) => {
-      const method = event.data.method
+    // Stop listening of message outside of React
+    window.removeEventListener('message', cacheMessages)
 
-      if (event.data.key !== COW_SWAP_WIDGET_EVENT_KEY || !method) return
+    // Process all cached messages
+    Object.keys(messagesCache).forEach((method) => {
+      processEvent(method, messagesCache[method])
 
-      if (method === 'update') {
-        if (prevData.current && deepEqual(prevData.current, event.data)) return
+      delete messagesCache[method]
+    })
 
-        prevData.current = event.data
-        updateParams(event.data.appParams)
-        navigate(event.data.urlParams)
-      }
+    // Start listening messages inside of React
+    window.addEventListener('message', (event) => {
+      const method = getEventMethod(event)
+
+      if (!method) return
+
+      processEvent(method, event.data)
     })
-  }, [navigate, updateParams])
+  }, [processEvent])
 
   return null
 }

From 2f23f3020068b00c33900f8d5e31b8045ab216e0 Mon Sep 17 00:00:00 2001
From: Nenad Vracar <34926005+nenadV91@users.noreply.github.com>
Date: Mon, 26 Jun 2023 15:49:09 +0200
Subject: [PATCH 34/67] Add wallet-connect v2 implementation (#2150)

* feat: implement wallet-connect v2

* fix: small update

* feat: updated versions

* fix: reorder imports

* fix: optimize icon and small code change

* feat: add lazy-loading

* feat: add v1 and v2 feature flags

* fix: disconnect v1 if flag is disabled

* feat: add logic to switch to v2 to other wallets that use wallet-connect

* fix: pr comments
---
 package.json                                  |  22 +-
 src/legacy/components/Header/index.tsx        |  21 +-
 .../containers/AccountDetails/index.tsx       |   8 +-
 .../wallet/api/assets/wallet-connect-v2.png   | Bin 0 -> 2965 bytes
 .../api/pure/ConnectWalletOption/index.tsx    |   1 +
 src/modules/wallet/api/types.ts               |   1 +
 src/modules/wallet/api/utils/connection.ts    |   2 +
 .../wallet/web3-react/connection/alpha.tsx    |  10 +-
 .../wallet/web3-react/connection/ambire.tsx   |  10 +-
 .../wallet/web3-react/connection/index.tsx    |  13 +-
 .../wallet/web3-react/connection/trust.tsx    |  10 +-
 .../web3-react/connection/walletConnectV2.tsx |  98 +++
 .../wallet/web3-react/connection/zengo.tsx    |  10 +-
 .../web3-react/hooks/useWalletMetadata.ts     |   6 +-
 yarn.lock                                     | 713 ++++++++++--------
 15 files changed, 603 insertions(+), 322 deletions(-)
 create mode 100644 src/modules/wallet/api/assets/wallet-connect-v2.png
 create mode 100644 src/modules/wallet/web3-react/connection/walletConnectV2.tsx

diff --git a/package.json b/package.json
index dc439aba80..3d8f28706f 100644
--- a/package.json
+++ b/package.json
@@ -119,17 +119,17 @@
     "@uniswap/v3-periphery": "^1.1.1",
     "@uniswap/v3-sdk": "^3.9.0",
     "@use-gesture/react": "^10.2.23",
-    "@web3-react/coinbase-wallet": "^8.1.2-beta.0",
-    "@web3-react/core": "^8.1.2-beta.0",
-    "@web3-react/eip1193": "^8.1.2-beta.0",
-    "@web3-react/empty": "^8.1.2-beta.0",
-    "@web3-react/gnosis-safe": "^8.1.2-beta.0",
-    "@web3-react/metamask": "^8.1.2-beta.0",
-    "@web3-react/network": "^8.1.2-beta.0",
-    "@web3-react/types": "^8.1.2-beta.0",
-    "@web3-react/url": "^8.1.2-beta.0",
-    "@web3-react/walletconnect": "^8.1.2-beta.0",
-    "@web3-react/walletconnect-v2": "^8.1.2-beta.0",
+    "@web3-react/coinbase-wallet": "^8.2.0",
+    "@web3-react/core": "^8.2.0",
+    "@web3-react/eip1193": "^8.2.0",
+    "@web3-react/empty": "^8.2.0",
+    "@web3-react/gnosis-safe": "^8.2.0",
+    "@web3-react/metamask": "^8.2.1",
+    "@web3-react/network": "^8.2.0",
+    "@web3-react/types": "^8.2.0",
+    "@web3-react/url": "^8.2.0",
+    "@web3-react/walletconnect": "^8.2.0",
+    "@web3-react/walletconnect-v2": "^8.3.1",
     "ajv": "^6.12.3",
     "bnc-sdk": "^4.6.0",
     "buffer": "^6.0.3",
diff --git a/src/legacy/components/Header/index.tsx b/src/legacy/components/Header/index.tsx
index ac252c6d11..092eb91af5 100644
--- a/src/legacy/components/Header/index.tsx
+++ b/src/legacy/components/Header/index.tsx
@@ -8,6 +8,7 @@ import { useNavigate } from 'react-router-dom'
 import { toggleDarkModeAnalytics } from 'legacy/components/analytics'
 import CowBalanceButton from 'legacy/components/CowBalanceButton'
 import NetworkSelector from 'legacy/components/Header/NetworkSelector'
+import { useIsActiveWallet } from 'legacy/hooks/useIsActiveWallet'
 import { LargeAndUp, upToLarge, upToMedium, upToSmall, useMediaQuery } from 'legacy/hooks/useMediaQuery'
 import { useDarkModeManager } from 'legacy/state/user/hooks'
 import { cowSwapLogo } from 'legacy/theme/cowSwapAssets'
@@ -22,9 +23,12 @@ import { useSwapRawState } from 'modules/swap/hooks/useSwapRawState'
 import { useNativeCurrencyBalances } from 'modules/tokens/hooks/useCurrencyBalance'
 import { useTradeState } from 'modules/trade/hooks/useTradeState'
 import { getDefaultTradeRawState } from 'modules/trade/types/TradeRawState'
-import { useWalletInfo, Web3Status } from 'modules/wallet'
+import { useDisconnectWallet, useWalletInfo, Web3Status } from 'modules/wallet'
+import { walletConnectConnection } from 'modules/wallet/web3-react/connection/walletConnect'
+import { walletConnectConnectionV2 } from 'modules/wallet/web3-react/connection/walletConnectV2'
 
 import { Routes } from 'common/constants/routes'
+import { useFeatureFlags } from 'common/hooks/featureFlags/useFeatureFlags'
 import { TokenAmount } from 'common/pure/TokenAmount'
 import { isInjectedWidget } from 'common/utils/isInjectedWidget'
 
@@ -55,6 +59,11 @@ export default function Header() {
   const isInjectedWidgetMode = isInjectedWidget()
   const injectedWidgetParams = useInjectedWidgetParams()
 
+  const { walletConnectV1Enabled, walletConnectV2Enabled } = useFeatureFlags()
+  const isWalletConnectV1 = useIsActiveWallet(walletConnectConnection)
+  const isWalletConnectV2 = useIsActiveWallet(walletConnectConnectionV2)
+  const disconnectWallet = useDisconnectWallet()
+
   const userEthBalance = useNativeCurrencyBalances(account ? [account] : [])?.[account ?? '']
   const nativeToken = chainId && (CHAIN_CURRENCY_LABELS[chainId] || 'ETH')
   const [darkMode, toggleDarkModeAux] = useDarkModeManager()
@@ -123,6 +132,16 @@ export default function Header() {
     isMobileMenuOpen || isOrdersPanelOpen ? addBodyClass('noScroll') : removeBodyClass('noScroll')
   }, [isOrdersPanelOpen, isMobileMenuOpen, isUpToLarge, isUpToMedium, isUpToSmall, isLargeAndUp])
 
+  // Disconnect wallet if its wallet-connect v1 and v1 flag is disabled
+  useEffect(() => {
+    if (
+      (walletConnectV1Enabled === false && isWalletConnectV1) ||
+      (walletConnectV2Enabled === false && isWalletConnectV2)
+    ) {
+      disconnectWallet()
+    }
+  }, [walletConnectV1Enabled, isWalletConnectV1, disconnectWallet, walletConnectV2Enabled, isWalletConnectV2])
+
   return (
     <Wrapper isMobileMenuOpen={isMobileMenuOpen}>
       <HeaderModWrapper>
diff --git a/src/modules/account/containers/AccountDetails/index.tsx b/src/modules/account/containers/AccountDetails/index.tsx
index edde7684e7..5c747a56fe 100644
--- a/src/modules/account/containers/AccountDetails/index.tsx
+++ b/src/modules/account/containers/AccountDetails/index.tsx
@@ -45,6 +45,7 @@ import { ledgerConnection } from 'modules/wallet/web3-react/connection/ledger'
 import { tallyWalletConnection } from 'modules/wallet/web3-react/connection/tally'
 import { trustWalletConnection } from 'modules/wallet/web3-react/connection/trust'
 import { walletConnectConnection } from 'modules/wallet/web3-react/connection/walletConnect'
+import { walletConnectConnectionV2 } from 'modules/wallet/web3-react/connection/walletConnectV2'
 
 import {
   NetworkCard,
@@ -201,10 +202,9 @@ export function AccountDetails({
     // In case the wallet is connected via WalletConnect and has wallet name set, add the suffix to be clear
     // This to avoid confusion for instance when using Metamask mobile
     // When name is not set, it defaults to WalletConnect already
-    const walletConnectSuffix =
-      getWeb3ReactConnection(connector) === walletConnectConnection && walletDetails?.walletName
-        ? ' (via WalletConnect)'
-        : ''
+    const connectionType = getWeb3ReactConnection(connector)
+    const isWalletConnect = connectionType === walletConnectConnection || connectionType === walletConnectConnectionV2
+    const walletConnectSuffix = isWalletConnect && walletDetails?.walletName ? ' (via WalletConnect)' : ''
 
     return (
       <WalletName>
diff --git a/src/modules/wallet/api/assets/wallet-connect-v2.png b/src/modules/wallet/api/assets/wallet-connect-v2.png
new file mode 100644
index 0000000000000000000000000000000000000000..2a02db54165bb4910845c001dc8ac46038f1c438
GIT binary patch
literal 2965
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
LNkvXXu0mjfC^s*Z

literal 0
HcmV?d00001

diff --git a/src/modules/wallet/api/pure/ConnectWalletOption/index.tsx b/src/modules/wallet/api/pure/ConnectWalletOption/index.tsx
index d6341c2c0c..f75c9eab9b 100644
--- a/src/modules/wallet/api/pure/ConnectWalletOption/index.tsx
+++ b/src/modules/wallet/api/pure/ConnectWalletOption/index.tsx
@@ -80,6 +80,7 @@ export const HeaderText = styled.div`
   ${({ theme }) => theme.flexRowNoWrap};
   font-size: 0.8rem;
   font-weight: 400;
+  white-space: nowrap;
 `
 
 const SubHeader = styled.div`
diff --git a/src/modules/wallet/api/types.ts b/src/modules/wallet/api/types.ts
index 75ad484297..6eaa901f6d 100644
--- a/src/modules/wallet/api/types.ts
+++ b/src/modules/wallet/api/types.ts
@@ -6,6 +6,7 @@ export enum ConnectionType {
   INJECTED_WIDGET = 'INJECTED_WIDGET',
   COINBASE_WALLET = 'COINBASE_WALLET',
   WALLET_CONNECT = 'WALLET_CONNECT',
+  WALLET_CONNECT_V2 = 'WALLET_CONNECT_V2',
   FORTMATIC = 'FORTMATIC',
   NETWORK = 'NETWORK',
   GNOSIS_SAFE = 'GNOSIS_SAFE',
diff --git a/src/modules/wallet/api/utils/connection.ts b/src/modules/wallet/api/utils/connection.ts
index 685b5a64cc..df3c9f5611 100644
--- a/src/modules/wallet/api/utils/connection.ts
+++ b/src/modules/wallet/api/utils/connection.ts
@@ -8,6 +8,8 @@ export function getConnectionName(connectionType: ConnectionType, isMetaMask?: b
       return 'Coinbase Wallet'
     case ConnectionType.WALLET_CONNECT:
       return 'WalletConnect'
+    case ConnectionType.WALLET_CONNECT_V2:
+      return 'WalletConnect v2'
     case ConnectionType.FORTMATIC:
       return 'Fortmatic'
     case ConnectionType.NETWORK:
diff --git a/src/modules/wallet/web3-react/connection/alpha.tsx b/src/modules/wallet/web3-react/connection/alpha.tsx
index 184577115b..2b60f67cb6 100644
--- a/src/modules/wallet/web3-react/connection/alpha.tsx
+++ b/src/modules/wallet/web3-react/connection/alpha.tsx
@@ -7,9 +7,12 @@ import { ConnectWalletOption } from 'modules/wallet/api/pure/ConnectWalletOption
 import { getConnectionName, getIsAlphaWallet } from 'modules/wallet/api/utils/connection'
 import { WC_DISABLED_TEXT } from 'modules/wallet/constants'
 
+import { useFeatureFlags } from 'common/hooks/featureFlags/useFeatureFlags'
+
 import { TryActivation } from '.'
 
 import { walletConnectConnection } from './walletConnect'
+import { walletConnectConnectionV2 } from './walletConnectV2'
 
 const alphaOption = {
   color: '#4196FC',
@@ -19,8 +22,11 @@ const alphaOption = {
 
 export function AlphaOption({ tryActivation }: { tryActivation: TryActivation }) {
   const { walletName } = useWalletMetaData()
+  const { walletConnectV1Enabled } = useFeatureFlags()
+
+  const connection = walletConnectV1Enabled ? walletConnectConnection : walletConnectConnectionV2
 
-  const isWalletConnect = useIsActiveWallet(walletConnectConnection)
+  const isWalletConnect = useIsActiveWallet(connection)
   const isActive = isWalletConnect && getIsAlphaWallet(walletName)
   const tooltipText = !isActive && isWalletConnect ? WC_DISABLED_TEXT : null
 
@@ -30,7 +36,7 @@ export function AlphaOption({ tryActivation }: { tryActivation: TryActivation })
       isActive={isActive}
       tooltipText={tooltipText}
       clickable={!isWalletConnect}
-      onClick={() => tryActivation(walletConnectConnection.connector)}
+      onClick={() => tryActivation(connection.connector)}
       header={getConnectionName(ConnectionType.ALPHA)}
     />
   )
diff --git a/src/modules/wallet/web3-react/connection/ambire.tsx b/src/modules/wallet/web3-react/connection/ambire.tsx
index bcb80c209f..da59ef40d1 100644
--- a/src/modules/wallet/web3-react/connection/ambire.tsx
+++ b/src/modules/wallet/web3-react/connection/ambire.tsx
@@ -7,9 +7,12 @@ import { ConnectWalletOption } from 'modules/wallet/api/pure/ConnectWalletOption
 import { getConnectionName, getIsAmbireWallet } from 'modules/wallet/api/utils/connection'
 import { WC_DISABLED_TEXT } from 'modules/wallet/constants'
 
+import { useFeatureFlags } from 'common/hooks/featureFlags/useFeatureFlags'
+
 import { TryActivation } from '.'
 
 import { walletConnectConnection } from './walletConnect'
+import { walletConnectConnectionV2 } from './walletConnectV2'
 
 const ambireOption = {
   color: '#4196FC',
@@ -19,8 +22,11 @@ const ambireOption = {
 
 export function AmbireOption({ tryActivation }: { tryActivation: TryActivation }) {
   const { walletName } = useWalletMetaData()
+  const { walletConnectV1Enabled } = useFeatureFlags()
+
+  const connection = walletConnectV1Enabled ? walletConnectConnection : walletConnectConnectionV2
 
-  const isWalletConnect = useIsActiveWallet(walletConnectConnection)
+  const isWalletConnect = useIsActiveWallet(connection)
   const isActive = isWalletConnect && getIsAmbireWallet(walletName)
   const tooltipText = !isActive && isWalletConnect ? WC_DISABLED_TEXT : null
 
@@ -30,7 +36,7 @@ export function AmbireOption({ tryActivation }: { tryActivation: TryActivation }
       isActive={isActive}
       tooltipText={tooltipText}
       clickable={!isWalletConnect}
-      onClick={() => tryActivation(walletConnectConnection.connector)}
+      onClick={() => tryActivation(connection.connector)}
       header={getConnectionName(ConnectionType.AMBIRE)}
     />
   )
diff --git a/src/modules/wallet/web3-react/connection/index.tsx b/src/modules/wallet/web3-react/connection/index.tsx
index 37f4c9aced..ba756701ec 100644
--- a/src/modules/wallet/web3-react/connection/index.tsx
+++ b/src/modules/wallet/web3-react/connection/index.tsx
@@ -6,6 +6,8 @@ import { /* isChrome, */ isMobile } from 'legacy/utils/userAgent'
 
 import { getIsCoinbaseWallet, getIsInjected, getIsMetaMask } from 'modules/wallet/api/utils/connection'
 
+import { FeatureGuard } from 'common/containers/FeatureGuard'
+
 import { AlphaOption } from './alpha'
 import { AmbireOption } from './ambire'
 import { CoinbaseWalletOption } from './coinbase'
@@ -22,6 +24,7 @@ import { tallyWalletConnection /* TallyWalletOption */ } from './tally'
 import { trustWalletConnection, TrustWalletOption } from './trust'
 import { WalletConnectOption } from './walletConnect'
 import { walletConnectConnection } from './walletConnect'
+import { WalletConnectV2Option, walletConnectConnectionV2 } from './walletConnectV2'
 import { ZengoOption } from './zengo'
 
 import { ConnectionType } from '../../api/types'
@@ -32,6 +35,7 @@ const CONNECTIONS: Web3ReactConnection[] = [
   injectedConnection,
   coinbaseWalletConnection,
   walletConnectConnection,
+  walletConnectConnectionV2,
   fortmaticConnection,
   networkConnection,
   tallyWalletConnection,
@@ -55,6 +59,7 @@ export function isChainAllowed(connector: Connector, chainId: number) {
     case injectedWidgetConnection.connector:
     case ledgerConnection.connector:
     case keystoneConnection.connector:
+    case walletConnectConnectionV2.connector:
       return ALL_SUPPORTED_CHAIN_IDS.includes(chainId)
     default:
       return false
@@ -76,6 +81,8 @@ export function getWeb3ReactConnection(c: Connector | ConnectionType): Web3React
         return coinbaseWalletConnection
       case ConnectionType.WALLET_CONNECT:
         return walletConnectConnection
+      case ConnectionType.WALLET_CONNECT_V2:
+        return walletConnectConnectionV2
       case ConnectionType.ZENGO:
         return walletConnectConnection
       case ConnectionType.FORTMATIC:
@@ -138,6 +145,9 @@ export function ConnectWalletOptions({ tryActivation }: { tryActivation: TryActi
   const walletConnectionOption =
     (!isInjectedMobileBrowser && <WalletConnectOption tryActivation={tryActivation} />) ?? null
 
+  const walletConnectionV2Option =
+    (!isInjectedMobileBrowser && <WalletConnectV2Option tryActivation={tryActivation} />) ?? null
+
   // Wallet-connect based
   const zengoOption = (!isInjectedMobileBrowser && <ZengoOption tryActivation={tryActivation} />) ?? null
   const ambireOption = (!isInjectedMobileBrowser && <AmbireOption tryActivation={tryActivation} />) ?? null
@@ -153,7 +163,8 @@ export function ConnectWalletOptions({ tryActivation }: { tryActivation: TryActi
   return (
     <>
       {injectedOption}
-      {walletConnectionOption}
+      <FeatureGuard featureFlag="walletConnectV1Enabled">{walletConnectionOption}</FeatureGuard>
+      <FeatureGuard featureFlag="walletConnectV2Enabled">{walletConnectionV2Option}</FeatureGuard>
       {coinbaseWalletOption}
       {ledgerOption}
       {zengoOption}
diff --git a/src/modules/wallet/web3-react/connection/trust.tsx b/src/modules/wallet/web3-react/connection/trust.tsx
index d11439a34e..d23c5cd2a4 100644
--- a/src/modules/wallet/web3-react/connection/trust.tsx
+++ b/src/modules/wallet/web3-react/connection/trust.tsx
@@ -11,7 +11,10 @@ import { getConnectionName, getIsTrustWallet } from 'modules/wallet/api/utils/co
 import { WC_DISABLED_TEXT } from 'modules/wallet/constants'
 import { InjectedWallet } from 'modules/wallet/web3-react/connectors/Injected'
 
+import { useFeatureFlags } from 'common/hooks/featureFlags/useFeatureFlags'
+
 import { walletConnectConnection } from './walletConnect'
+import { walletConnectConnectionV2 } from './walletConnectV2'
 
 import { Web3ReactConnection } from '../types'
 
@@ -51,8 +54,11 @@ export function TrustWalletInjectedOption({ tryActivation }: { tryActivation: (c
 
 export function TrustWalletWCOption({ tryActivation }: { tryActivation: (connector: Connector) => void }) {
   const { walletName } = useWalletMetaData()
+  const { walletConnectV1Enabled } = useFeatureFlags()
+
+  const connection = walletConnectV1Enabled ? walletConnectConnection : walletConnectConnectionV2
 
-  const isWalletConnect = useIsActiveWallet(walletConnectConnection)
+  const isWalletConnect = useIsActiveWallet(connection)
   const isActive = isWalletConnect && getIsTrustWallet(null, walletName)
   const tooltipText = !isActive && isWalletConnect ? WC_DISABLED_TEXT : null
 
@@ -62,7 +68,7 @@ export function TrustWalletWCOption({ tryActivation }: { tryActivation: (connect
       isActive={isActive}
       tooltipText={tooltipText}
       clickable={!isWalletConnect}
-      onClick={() => tryActivation(walletConnectConnection.connector)}
+      onClick={() => tryActivation(connection.connector)}
       header={getConnectionName(ConnectionType.TRUST)}
     />
   )
diff --git a/src/modules/wallet/web3-react/connection/walletConnectV2.tsx b/src/modules/wallet/web3-react/connection/walletConnectV2.tsx
new file mode 100644
index 0000000000..295f71a744
--- /dev/null
+++ b/src/modules/wallet/web3-react/connection/walletConnectV2.tsx
@@ -0,0 +1,98 @@
+import { useMemo } from 'react'
+
+import { initializeConnector } from '@web3-react/core'
+
+import { RPC_URLS } from 'legacy/constants/networks'
+import { useIsActiveWallet } from 'legacy/hooks/useIsActiveWallet'
+
+import { ConnectionType, useWalletMetaData } from 'modules/wallet'
+import { default as WalletConnectV2Image } from 'modules/wallet/api/assets/wallet-connect-v2.png'
+import { ConnectWalletOption } from 'modules/wallet/api/pure/ConnectWalletOption'
+import {
+  getConnectionName,
+  getIsAlphaWallet,
+  getIsAmbireWallet,
+  getIsTrustWallet,
+  getIsZengoWallet,
+} from 'modules/wallet/api/utils/connection'
+import { WC_DISABLED_TEXT } from 'modules/wallet/constants'
+
+import { useFeatureFlags } from 'common/hooks/featureFlags/useFeatureFlags'
+
+import { TryActivation, onError } from '.'
+
+import { AsyncConnector } from './asyncConnector'
+
+import { Web3ReactConnection } from '../types'
+
+const WC_PROJECT_ID = process.env.REACT_APP_WC_PROJECT_ID
+const WC_DEFAULT_PROJECT_ID = 'a6cc11517a10f6f12953fd67b1eb67e7'
+const TOOLTIP_TEXT = 'Under development and unsupported by most wallets'
+
+export const walletConnectV2Option = {
+  color: '#4196FC',
+  icon: WalletConnectV2Image,
+  id: 'wallet-connect-v2',
+}
+
+const [mainnet, ...optionalChains] = Object.keys(RPC_URLS).map(Number)
+
+const [web3WalletConnectV2, web3WalletConnectV2Hooks] = initializeConnector<AsyncConnector>(
+  (actions) =>
+    new AsyncConnector(
+      () =>
+        import('@web3-react/walletconnect-v2').then(
+          (m) =>
+            new m.WalletConnect({
+              actions,
+              options: {
+                projectId: WC_PROJECT_ID || WC_DEFAULT_PROJECT_ID,
+                chains: [mainnet],
+                optionalChains,
+                showQrModal: true,
+              },
+              onError,
+            })
+        ),
+      actions,
+      onError
+    )
+)
+
+export const walletConnectConnectionV2: Web3ReactConnection = {
+  connector: web3WalletConnectV2,
+  hooks: web3WalletConnectV2Hooks,
+  type: ConnectionType.WALLET_CONNECT_V2,
+}
+
+export function WalletConnectV2Option({ tryActivation }: { tryActivation: TryActivation }) {
+  const { walletName } = useWalletMetaData()
+  const { walletConnectV1Enabled } = useFeatureFlags()
+
+  const isWalletConnect = useIsActiveWallet(walletConnectConnectionV2)
+  const isActive =
+    isWalletConnect &&
+    !getIsZengoWallet(walletName) &&
+    !getIsAmbireWallet(walletName) &&
+    !getIsAlphaWallet(walletName) &&
+    !getIsTrustWallet(null, walletName)
+
+  const tooltipText = useMemo(() => {
+    if (walletConnectV1Enabled) {
+      return TOOLTIP_TEXT
+    }
+
+    return !isActive && isWalletConnect ? WC_DISABLED_TEXT : null
+  }, [isActive, isWalletConnect, walletConnectV1Enabled])
+
+  return (
+    <ConnectWalletOption
+      {...walletConnectV2Option}
+      isActive={isActive}
+      tooltipText={tooltipText}
+      clickable={!isWalletConnect}
+      onClick={() => tryActivation(walletConnectConnectionV2.connector)}
+      header={getConnectionName(ConnectionType.WALLET_CONNECT_V2)}
+    />
+  )
+}
diff --git a/src/modules/wallet/web3-react/connection/zengo.tsx b/src/modules/wallet/web3-react/connection/zengo.tsx
index 12827a739b..483cd21ff1 100644
--- a/src/modules/wallet/web3-react/connection/zengo.tsx
+++ b/src/modules/wallet/web3-react/connection/zengo.tsx
@@ -7,9 +7,12 @@ import { ConnectWalletOption } from 'modules/wallet/api/pure/ConnectWalletOption
 import { getConnectionName, getIsZengoWallet } from 'modules/wallet/api/utils/connection'
 import { WC_DISABLED_TEXT } from 'modules/wallet/constants'
 
+import { useFeatureFlags } from 'common/hooks/featureFlags/useFeatureFlags'
+
 import { TryActivation } from '.'
 
 import { walletConnectConnection } from './walletConnect'
+import { walletConnectConnectionV2 } from './walletConnectV2'
 
 export const zengoOption = {
   color: '#4196FC',
@@ -19,8 +22,11 @@ export const zengoOption = {
 
 export function ZengoOption({ tryActivation }: { tryActivation: TryActivation }) {
   const { walletName } = useWalletMetaData()
+  const { walletConnectV1Enabled } = useFeatureFlags()
+
+  const connection = walletConnectV1Enabled ? walletConnectConnection : walletConnectConnectionV2
 
-  const isWalletConnect = useIsActiveWallet(walletConnectConnection)
+  const isWalletConnect = useIsActiveWallet(connection)
   const isActive = isWalletConnect && getIsZengoWallet(walletName)
   const tooltipText = !isActive && isWalletConnect ? WC_DISABLED_TEXT : null
 
@@ -30,7 +36,7 @@ export function ZengoOption({ tryActivation }: { tryActivation: TryActivation })
       isActive={isActive}
       tooltipText={tooltipText}
       clickable={!isWalletConnect}
-      onClick={() => tryActivation(walletConnectConnection.connector)}
+      onClick={() => tryActivation(connection.connector)}
       header={getConnectionName(ConnectionType.ZENGO)}
     />
   )
diff --git a/src/modules/wallet/web3-react/hooks/useWalletMetadata.ts b/src/modules/wallet/web3-react/hooks/useWalletMetadata.ts
index 04626a02f0..c6bb20f608 100644
--- a/src/modules/wallet/web3-react/hooks/useWalletMetadata.ts
+++ b/src/modules/wallet/web3-react/hooks/useWalletMetadata.ts
@@ -51,7 +51,9 @@ function getWcPeerMetadata(provider: any | undefined): WalletMetaData {
     return defaultOutput
   }
 
-  const meta = provider.connector.peerMeta
+  const v1MetaData = provider?.connector?.peerMeta
+  const v2MetaData = provider?.signer?.session?.peer?.metadata
+  const meta = v1MetaData || v2MetaData
 
   if (meta) {
     return {
@@ -73,7 +75,7 @@ export function useWalletMetaData(): WalletMetaData {
       return METADATA_DISCONNECTED
     }
 
-    if (connectionType === ConnectionType.WALLET_CONNECT) {
+    if (connectionType === ConnectionType.WALLET_CONNECT || connectionType === ConnectionType.WALLET_CONNECT_V2) {
       const wc = provider?.provider
 
       if ((wc as any)?.isWalletConnect) {
diff --git a/yarn.lock b/yarn.lock
index e04b547804..ebf471521b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3950,6 +3950,18 @@
     "@babel/runtime" "^7.11.2"
     "@lingui/core" "^3.15.0"
 
+"@lit-labs/ssr-dom-shim@^1.0.0", "@lit-labs/ssr-dom-shim@^1.1.0":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@lit-labs/ssr-dom-shim/-/ssr-dom-shim-1.1.1.tgz#64df34e2f12e68e78ac57e571d25ec07fa460ca9"
+  integrity sha512-kXOeFbfCm4fFf2A3WwVEeQj55tMZa8c8/f9AKHMobQMkzNUfUj+antR3fRPaZJawsa1aZiP/Da3ndpZrwEe4rQ==
+
+"@lit/reactive-element@^1.3.0", "@lit/reactive-element@^1.6.0":
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/@lit/reactive-element/-/reactive-element-1.6.1.tgz#0d958b6d479d0e3db5fc1132ecc4fa84be3f0b93"
+  integrity sha512-va15kYZr7KZNNPZdxONGQzpUr+4sxVu7V/VG7a8mRfPPXUyhEYj5RzXCQmGrlP3tAh0L3HHm5AjBMFYRqlM9SA==
+  dependencies:
+    "@lit-labs/ssr-dom-shim" "^1.0.0"
+
 "@messageformat/parser@^5.0.0":
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/@messageformat/parser/-/parser-5.0.0.tgz#5737e69d7d4a469998b527710f1891174fc1b262"
@@ -4017,6 +4029,75 @@
   resolved "https://registry.yarnpkg.com/@microsoft/tsdoc/-/tsdoc-0.14.2.tgz#c3ec604a0b54b9a9b87e9735dfc59e1a5da6a5fb"
   integrity sha512-9b8mPpKrfeGRuhFH5iO1iwCLeIIsV6+H1sRfxbkoGXIyQE2BTsPd9zqSqQJ+pv5sJ/hT5M1zvOFL02MnEezFug==
 
+"@motionone/animation@^10.15.1":
+  version "10.15.1"
+  resolved "https://registry.yarnpkg.com/@motionone/animation/-/animation-10.15.1.tgz#4a85596c31cbc5100ae8eb8b34c459fb0ccf6807"
+  integrity sha512-mZcJxLjHor+bhcPuIFErMDNyrdb2vJur8lSfMCsuCB4UyV8ILZLvK+t+pg56erv8ud9xQGK/1OGPt10agPrCyQ==
+  dependencies:
+    "@motionone/easing" "^10.15.1"
+    "@motionone/types" "^10.15.1"
+    "@motionone/utils" "^10.15.1"
+    tslib "^2.3.1"
+
+"@motionone/dom@^10.15.5", "@motionone/dom@^10.16.2":
+  version "10.16.2"
+  resolved "https://registry.yarnpkg.com/@motionone/dom/-/dom-10.16.2.tgz#0c44df8ee3d1cfc50ee11d27050b27824355a61a"
+  integrity sha512-bnuHdNbge1FutZXv+k7xub9oPWcF0hsu8y1HTH/qg6av58YI0VufZ3ngfC7p2xhMJMnoh0LXFma2EGTgPeCkeg==
+  dependencies:
+    "@motionone/animation" "^10.15.1"
+    "@motionone/generators" "^10.15.1"
+    "@motionone/types" "^10.15.1"
+    "@motionone/utils" "^10.15.1"
+    hey-listen "^1.0.8"
+    tslib "^2.3.1"
+
+"@motionone/easing@^10.15.1":
+  version "10.15.1"
+  resolved "https://registry.yarnpkg.com/@motionone/easing/-/easing-10.15.1.tgz#95cf3adaef34da6deebb83940d8143ede3deb693"
+  integrity sha512-6hIHBSV+ZVehf9dcKZLT7p5PEKHGhDwky2k8RKkmOvUoYP3S+dXsKupyZpqx5apjd9f+php4vXk4LuS+ADsrWw==
+  dependencies:
+    "@motionone/utils" "^10.15.1"
+    tslib "^2.3.1"
+
+"@motionone/generators@^10.15.1":
+  version "10.15.1"
+  resolved "https://registry.yarnpkg.com/@motionone/generators/-/generators-10.15.1.tgz#dc6abb11139d1bafe758a41c134d4c753a9b871c"
+  integrity sha512-67HLsvHJbw6cIbLA/o+gsm7h+6D4Sn7AUrB/GPxvujse1cGZ38F5H7DzoH7PhX+sjvtDnt2IhFYF2Zp1QTMKWQ==
+  dependencies:
+    "@motionone/types" "^10.15.1"
+    "@motionone/utils" "^10.15.1"
+    tslib "^2.3.1"
+
+"@motionone/svelte@^10.15.5":
+  version "10.16.2"
+  resolved "https://registry.yarnpkg.com/@motionone/svelte/-/svelte-10.16.2.tgz#0b37c3b12927814d31d24941d1ca0ff49981b444"
+  integrity sha512-38xsroKrfK+aHYhuQlE6eFcGy0EwrB43Q7RGjF73j/kRUTcLNu/LAaKiLLsN5lyqVzCgTBVt4TMT/ShWbTbc5Q==
+  dependencies:
+    "@motionone/dom" "^10.16.2"
+    tslib "^2.3.1"
+
+"@motionone/types@^10.15.1":
+  version "10.15.1"
+  resolved "https://registry.yarnpkg.com/@motionone/types/-/types-10.15.1.tgz#89441b54285012795cbba8612cbaa0fa420db3eb"
+  integrity sha512-iIUd/EgUsRZGrvW0jqdst8st7zKTzS9EsKkP+6c6n4MPZoQHwiHuVtTQLD6Kp0bsBLhNzKIBlHXponn/SDT4hA==
+
+"@motionone/utils@^10.15.1":
+  version "10.15.1"
+  resolved "https://registry.yarnpkg.com/@motionone/utils/-/utils-10.15.1.tgz#6b5f51bde75be88b5411e084310299050368a438"
+  integrity sha512-p0YncgU+iklvYr/Dq4NobTRdAPv9PveRDUXabPEeOjBLSO/1FNB2phNTZxOxpi1/GZwYpAoECEa0Wam+nsmhSw==
+  dependencies:
+    "@motionone/types" "^10.15.1"
+    hey-listen "^1.0.8"
+    tslib "^2.3.1"
+
+"@motionone/vue@^10.15.5":
+  version "10.16.2"
+  resolved "https://registry.yarnpkg.com/@motionone/vue/-/vue-10.16.2.tgz#faf13afc27620a2df870c71c58a04ee8de8dea65"
+  integrity sha512-7/dEK/nWQXOkJ70bqb2KyNfSWbNvWqKKq1C8juj+0Mg/AorgD8O5wE3naddK0G+aXuNMqRuc4jlsYHHWHtIzVw==
+  dependencies:
+    "@motionone/dom" "^10.16.2"
+    tslib "^2.3.1"
+
 "@multiformats/base-x@^4.0.1":
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/@multiformats/base-x/-/base-x-4.0.1.tgz#95ff0fa58711789d53aefb2590a8b7a4e715d121"
@@ -7208,26 +7289,26 @@
     "@walletconnect/types" "^1.8.0"
     "@walletconnect/utils" "^1.8.0"
 
-"@walletconnect/core@2.5.2":
-  version "2.5.2"
-  resolved "https://registry.yarnpkg.com/@walletconnect/core/-/core-2.5.2.tgz#999605a62a3b37867d2559e40b62778534eb787c"
-  integrity sha512-R0D9NKgHBpdun65q+1L49GOIGDLaIodnyb+Dq0tXGVzvXzy2lkXOlh2e9am61ixaVrUsHt7b96b318geqsuk4Q==
+"@walletconnect/core@2.7.7":
+  version "2.7.7"
+  resolved "https://registry.yarnpkg.com/@walletconnect/core/-/core-2.7.7.tgz#49ddaa9d8aff365cd347b951d9b4c1c39a949e83"
+  integrity sha512-/Tmrjx9XDG8qylsUFU2fWvMoxlDwW+zzUcCgTaebMAmssCZ8NSknbBdjAdAKiey1TaLEgFkaCxXgXfioinWNYg==
   dependencies:
-    "@walletconnect/heartbeat" "1.2.0"
-    "@walletconnect/jsonrpc-provider" "1.0.10"
-    "@walletconnect/jsonrpc-utils" "^1.0.4"
-    "@walletconnect/jsonrpc-ws-connection" "1.0.10"
+    "@walletconnect/heartbeat" "1.2.1"
+    "@walletconnect/jsonrpc-provider" "1.0.13"
+    "@walletconnect/jsonrpc-types" "1.0.3"
+    "@walletconnect/jsonrpc-utils" "1.0.8"
+    "@walletconnect/jsonrpc-ws-connection" "^1.0.11"
     "@walletconnect/keyvaluestorage" "^1.0.2"
     "@walletconnect/logger" "^2.0.1"
     "@walletconnect/relay-api" "^1.0.9"
     "@walletconnect/relay-auth" "^1.0.4"
-    "@walletconnect/safe-json" "^1.0.1"
+    "@walletconnect/safe-json" "^1.0.2"
     "@walletconnect/time" "^1.0.2"
-    "@walletconnect/types" "2.5.2"
-    "@walletconnect/utils" "2.5.2"
+    "@walletconnect/types" "2.7.7"
+    "@walletconnect/utils" "2.7.7"
     events "^3.3.0"
     lodash.isequal "4.5.0"
-    pino "7.11.0"
     uint8arrays "^3.1.0"
 
 "@walletconnect/core@^1.8.0":
@@ -7281,19 +7362,19 @@
     eip1193-provider "1.0.1"
     eventemitter3 "4.0.7"
 
-"@walletconnect/ethereum-provider@^2.4.7":
-  version "2.5.2"
-  resolved "https://registry.yarnpkg.com/@walletconnect/ethereum-provider/-/ethereum-provider-2.5.2.tgz#b70c01fc281ae8b6c424fc063bc48b476ef3f83a"
-  integrity sha512-WEN85tsuHgvoiMK4KpsRsOgsKB0QLCctSwxTqyWDybBbXuJRJGWXkZ6Oma9VSmUR0MgPSjiGmOFgY4ybMlhEMA==
-  dependencies:
-    "@walletconnect/jsonrpc-http-connection" "^1.0.4"
-    "@walletconnect/jsonrpc-provider" "^1.0.6"
-    "@walletconnect/jsonrpc-types" "^1.0.2"
-    "@walletconnect/jsonrpc-utils" "^1.0.4"
-    "@walletconnect/sign-client" "2.5.2"
-    "@walletconnect/types" "2.5.2"
-    "@walletconnect/universal-provider" "2.5.2"
-    "@walletconnect/utils" "2.5.2"
+"@walletconnect/ethereum-provider@^2.7.4":
+  version "2.7.7"
+  resolved "https://registry.yarnpkg.com/@walletconnect/ethereum-provider/-/ethereum-provider-2.7.7.tgz#1b7b934c0a4f7a504174d28006c964f48523ee01"
+  integrity sha512-wVVMgpMMcPySBKHAPu7QfL18TMrjAgOePz/mfuOjWal+vT9yVSPA34oFyHlzJKvcQ/abP7Zj3AzDtZbyXWRxwQ==
+  dependencies:
+    "@walletconnect/jsonrpc-http-connection" "^1.0.7"
+    "@walletconnect/jsonrpc-provider" "^1.0.13"
+    "@walletconnect/jsonrpc-types" "^1.0.3"
+    "@walletconnect/jsonrpc-utils" "^1.0.8"
+    "@walletconnect/sign-client" "2.7.7"
+    "@walletconnect/types" "2.7.7"
+    "@walletconnect/universal-provider" "2.7.7"
+    "@walletconnect/utils" "2.7.7"
     events "^3.3.0"
 
 "@walletconnect/events@^1.0.1":
@@ -7304,16 +7385,13 @@
     keyvaluestorage-interface "^1.0.0"
     tslib "1.14.1"
 
-"@walletconnect/heartbeat@1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@walletconnect/heartbeat/-/heartbeat-1.2.0.tgz#1e87dd234cb72b0587b84f95c4f942f2b4bd0c79"
-  integrity sha512-0vbzTa/ARrpmMmOD+bQMxPvFYKtOLQZObgZakrYr0aODiMOO71CmPVNV2eAqXnw9rMmcP+z91OybLeIFlwTjjA==
+"@walletconnect/heartbeat@1.2.1":
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@walletconnect/heartbeat/-/heartbeat-1.2.1.tgz#afaa3a53232ae182d7c9cff41c1084472d8f32e9"
+  integrity sha512-yVzws616xsDLJxuG/28FqtZ5rzrTA4gUjdEMTbWB5Y8V1XHRmqq4efAxCw5ie7WjbXFSUyBHaWlMR+2/CpQC5Q==
   dependencies:
     "@walletconnect/events" "^1.0.1"
     "@walletconnect/time" "^1.0.2"
-    chai "^4.3.7"
-    mocha "^10.2.0"
-    ts-node "^10.9.1"
     tslib "1.14.1"
 
 "@walletconnect/iso-crypto@^1.8.0":
@@ -7325,7 +7403,7 @@
     "@walletconnect/types" "^1.8.0"
     "@walletconnect/utils" "^1.8.0"
 
-"@walletconnect/jsonrpc-http-connection@^1.0.2", "@walletconnect/jsonrpc-http-connection@^1.0.4":
+"@walletconnect/jsonrpc-http-connection@^1.0.2":
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/@walletconnect/jsonrpc-http-connection/-/jsonrpc-http-connection-1.0.6.tgz#48c41cf3e5ac9add9425420b345615dc438594cd"
   integrity sha512-/3zSqDi7JDN06E4qm0NmVYMitngXfh21UWwy8zeJcBeJc+Jcs094EbLsIxtziIIKTCCbT88lWuTjl1ZujxN7cw==
@@ -7335,7 +7413,26 @@
     cross-fetch "^3.1.4"
     tslib "1.14.1"
 
-"@walletconnect/jsonrpc-provider@1.0.10", "@walletconnect/jsonrpc-provider@^1.0.5", "@walletconnect/jsonrpc-provider@^1.0.6":
+"@walletconnect/jsonrpc-http-connection@^1.0.7":
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/@walletconnect/jsonrpc-http-connection/-/jsonrpc-http-connection-1.0.7.tgz#a6973569b8854c22da707a759d241e4f5c2d5a98"
+  integrity sha512-qlfh8fCfu8LOM9JRR9KE0s0wxP6ZG9/Jom8M0qsoIQeKF3Ni0FyV4V1qy/cc7nfI46SLQLSl4tgWSfLiE1swyQ==
+  dependencies:
+    "@walletconnect/jsonrpc-utils" "^1.0.6"
+    "@walletconnect/safe-json" "^1.0.1"
+    cross-fetch "^3.1.4"
+    tslib "1.14.1"
+
+"@walletconnect/jsonrpc-provider@1.0.13", "@walletconnect/jsonrpc-provider@^1.0.13":
+  version "1.0.13"
+  resolved "https://registry.yarnpkg.com/@walletconnect/jsonrpc-provider/-/jsonrpc-provider-1.0.13.tgz#9a74da648d015e1fffc745f0c7d629457f53648b"
+  integrity sha512-K73EpThqHnSR26gOyNEL+acEex3P7VWZe6KE12ZwKzAt2H4e5gldZHbjsu2QR9cLeJ8AXuO7kEMOIcRv1QEc7g==
+  dependencies:
+    "@walletconnect/jsonrpc-utils" "^1.0.8"
+    "@walletconnect/safe-json" "^1.0.2"
+    tslib "1.14.1"
+
+"@walletconnect/jsonrpc-provider@^1.0.5":
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/@walletconnect/jsonrpc-provider/-/jsonrpc-provider-1.0.10.tgz#8351a06b70faa8f8c0e77dc2c6d9b0190d17d407"
   integrity sha512-g0ffPSpY3P6GqGjWGHsr3yqvQUhj7q2k6pAikoXv5XTXWaJRzFvrlbFkSgxziXsBrwrMZn0qvPufvpN4mMZ5FA==
@@ -7344,6 +7441,14 @@
     "@walletconnect/safe-json" "^1.0.1"
     tslib "1.14.1"
 
+"@walletconnect/jsonrpc-types@1.0.3", "@walletconnect/jsonrpc-types@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@walletconnect/jsonrpc-types/-/jsonrpc-types-1.0.3.tgz#65e3b77046f1a7fa8347ae02bc1b841abe6f290c"
+  integrity sha512-iIQ8hboBl3o5ufmJ8cuduGad0CQm3ZlsHtujv9Eu16xq89q+BG7Nh5VLxxUgmtpnrePgFkTwXirCTkwJH1v+Yw==
+  dependencies:
+    keyvaluestorage-interface "^1.0.0"
+    tslib "1.14.1"
+
 "@walletconnect/jsonrpc-types@^1.0.1", "@walletconnect/jsonrpc-types@^1.0.2":
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/@walletconnect/jsonrpc-types/-/jsonrpc-types-1.0.2.tgz#b79519f679cd6a5fa4a1bea888f27c1916689a20"
@@ -7352,7 +7457,16 @@
     keyvaluestorage-interface "^1.0.0"
     tslib "1.14.1"
 
-"@walletconnect/jsonrpc-utils@^1.0.3", "@walletconnect/jsonrpc-utils@^1.0.4":
+"@walletconnect/jsonrpc-utils@1.0.8", "@walletconnect/jsonrpc-utils@^1.0.7", "@walletconnect/jsonrpc-utils@^1.0.8":
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/@walletconnect/jsonrpc-utils/-/jsonrpc-utils-1.0.8.tgz#82d0cc6a5d6ff0ecc277cb35f71402c91ad48d72"
+  integrity sha512-vdeb03bD8VzJUL6ZtzRYsFMq1eZQcM3EAzT0a3st59dyLfJ0wq+tKMpmGH7HlB7waD858UWgfIcudbPFsbzVdw==
+  dependencies:
+    "@walletconnect/environment" "^1.0.1"
+    "@walletconnect/jsonrpc-types" "^1.0.3"
+    tslib "1.14.1"
+
+"@walletconnect/jsonrpc-utils@^1.0.3":
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/@walletconnect/jsonrpc-utils/-/jsonrpc-utils-1.0.4.tgz#2009ba3907b02516f2caacd2fb871ff0d472b2cb"
   integrity sha512-y0+tDxcTZ9BHBBKBJbjZxLUXb+zQZCylf7y/jTvDPNx76J0hYYc+F9zHzyqBLeorSKepLTk6yI8hw3NXbAQB3g==
@@ -7370,13 +7484,13 @@
     "@walletconnect/jsonrpc-types" "^1.0.2"
     tslib "1.14.1"
 
-"@walletconnect/jsonrpc-ws-connection@1.0.10":
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/@walletconnect/jsonrpc-ws-connection/-/jsonrpc-ws-connection-1.0.10.tgz#04e04a7d8c70b27c386a1bdd9ff6511045da3c81"
-  integrity sha512-/tidvjfCXZuYugjF5fOswsNDPoMo9QRML3DFQ0dfNUarL4f5HGqu8NDGerr2n0+4MOX23GsT6Vv2POSwFbvgGw==
+"@walletconnect/jsonrpc-ws-connection@^1.0.11":
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/@walletconnect/jsonrpc-ws-connection/-/jsonrpc-ws-connection-1.0.11.tgz#1ce59d86f273d576ca73385961303ebd44dd923f"
+  integrity sha512-TiFJ6saasKXD+PwGkm5ZGSw0837nc6EeFmurSPgIT/NofnOV4Tv7CVJqGQN0rQYoJUSYu21cwHNYaFkzNpUN+w==
   dependencies:
     "@walletconnect/jsonrpc-utils" "^1.0.6"
-    "@walletconnect/safe-json" "^1.0.1"
+    "@walletconnect/safe-json" "^1.0.2"
     events "^3.3.0"
     tslib "1.14.1"
     ws "^7.5.1"
@@ -7456,21 +7570,27 @@
   dependencies:
     tslib "1.14.1"
 
-"@walletconnect/sign-client@2.5.2":
-  version "2.5.2"
-  resolved "https://registry.yarnpkg.com/@walletconnect/sign-client/-/sign-client-2.5.2.tgz#d05df9dce271720fdb75741fb162dcc899e39029"
-  integrity sha512-eKUnGCVgYqN+6b4gm27ML/064m0c/2hTlTHy6tbUszYtEPTzb+q4fvpnWs6blaOjzc18l8NFwX3c1+MHxVdQUQ==
+"@walletconnect/safe-json@^1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@walletconnect/safe-json/-/safe-json-1.0.2.tgz#7237e5ca48046e4476154e503c6d3c914126fa77"
+  integrity sha512-Ogb7I27kZ3LPC3ibn8ldyUr5544t3/STow9+lzz7Sfo808YD7SBWk7SAsdBFlYgP2zDRy2hS3sKRcuSRM0OTmA==
   dependencies:
-    "@walletconnect/core" "2.5.2"
+    tslib "1.14.1"
+
+"@walletconnect/sign-client@2.7.7":
+  version "2.7.7"
+  resolved "https://registry.yarnpkg.com/@walletconnect/sign-client/-/sign-client-2.7.7.tgz#a2be064eaff37ab036919bd33f1cf9ddf4681fdd"
+  integrity sha512-lTyF8ZEp+HwPNBW/Fw5iWnMm9O5tC1qwf5YfhNczZ7+q6+UUopOoRrsAvwqftJIkgKmfC8lHT52G/XM2JGVjbQ==
+  dependencies:
+    "@walletconnect/core" "2.7.7"
     "@walletconnect/events" "^1.0.1"
-    "@walletconnect/heartbeat" "1.2.0"
-    "@walletconnect/jsonrpc-utils" "^1.0.4"
+    "@walletconnect/heartbeat" "1.2.1"
+    "@walletconnect/jsonrpc-utils" "1.0.8"
     "@walletconnect/logger" "^2.0.1"
     "@walletconnect/time" "^1.0.2"
-    "@walletconnect/types" "2.5.2"
-    "@walletconnect/utils" "2.5.2"
+    "@walletconnect/types" "2.7.7"
+    "@walletconnect/utils" "2.7.7"
     events "^3.3.0"
-    pino "7.11.0"
 
 "@walletconnect/signer-connection@^1.8.0":
   version "1.8.0"
@@ -7500,14 +7620,14 @@
   dependencies:
     tslib "1.14.1"
 
-"@walletconnect/types@2.5.2":
-  version "2.5.2"
-  resolved "https://registry.yarnpkg.com/@walletconnect/types/-/types-2.5.2.tgz#b2ad73f9e6e19a90fe372babc9ed461fe27098fe"
-  integrity sha512-VnV43qs4f2hwv6wGQ9ZSE+smP0z2oVy2XaVO5Szd2fmOx9bB+ov+sQzh9xeoQ+DhjNrbJhUaecW/peE6CPPSag==
+"@walletconnect/types@2.7.7":
+  version "2.7.7"
+  resolved "https://registry.yarnpkg.com/@walletconnect/types/-/types-2.7.7.tgz#c02831a17b6162d8594c45e3cc4668015e022f51"
+  integrity sha512-Z4Y+BKPX7X1UBCf7QV35mVy2QU9CS+5G+EthCaJwpieirZNHamHEwNXUjuUUb3PrYOLwlfRYUT5edeFW9wvoeQ==
   dependencies:
     "@walletconnect/events" "^1.0.1"
-    "@walletconnect/heartbeat" "1.2.0"
-    "@walletconnect/jsonrpc-types" "^1.0.2"
+    "@walletconnect/heartbeat" "1.2.1"
+    "@walletconnect/jsonrpc-types" "1.0.3"
     "@walletconnect/keyvaluestorage" "^1.0.2"
     "@walletconnect/logger" "^2.0.1"
     events "^3.3.0"
@@ -7517,42 +7637,40 @@
   resolved "https://registry.yarnpkg.com/@walletconnect/types/-/types-1.8.0.tgz#3f5e85b2d6b149337f727ab8a71b8471d8d9a195"
   integrity sha512-Cn+3I0V0vT9ghMuzh1KzZvCkiAxTq+1TR2eSqw5E5AVWfmCtECFkVZBP6uUJZ8YjwLqXheI+rnjqPy7sVM4Fyg==
 
-"@walletconnect/universal-provider@2.5.2":
-  version "2.5.2"
-  resolved "https://registry.yarnpkg.com/@walletconnect/universal-provider/-/universal-provider-2.5.2.tgz#f0ec21be16cde5c42f2dc87630add01d2e01acbb"
-  integrity sha512-R61VL02zvcljwSC+FJVzxGswbN21tokQLG0IQL1tVq30+KfkZOt0y/UxsDNvgHNGleGgfoQZzOWsfSLgp5pcBQ==
+"@walletconnect/universal-provider@2.7.7":
+  version "2.7.7"
+  resolved "https://registry.yarnpkg.com/@walletconnect/universal-provider/-/universal-provider-2.7.7.tgz#5c9017672b5d1255442533395eda67b19ffb2f2f"
+  integrity sha512-MY+R1sLmIKjFYjanWUM6bOM077+SnShSUfSjCTrsoZE2RDddcSz9EtcATovBSPfzPwUTS20mgcgrkRT4zrFRyQ==
   dependencies:
-    "@walletconnect/jsonrpc-http-connection" "^1.0.4"
-    "@walletconnect/jsonrpc-provider" "^1.0.6"
+    "@walletconnect/jsonrpc-http-connection" "^1.0.7"
+    "@walletconnect/jsonrpc-provider" "1.0.13"
     "@walletconnect/jsonrpc-types" "^1.0.2"
-    "@walletconnect/jsonrpc-utils" "^1.0.4"
+    "@walletconnect/jsonrpc-utils" "^1.0.7"
     "@walletconnect/logger" "^2.0.1"
-    "@walletconnect/sign-client" "2.5.2"
-    "@walletconnect/types" "2.5.2"
-    "@walletconnect/utils" "2.5.2"
+    "@walletconnect/sign-client" "2.7.7"
+    "@walletconnect/types" "2.7.7"
+    "@walletconnect/utils" "2.7.7"
     eip1193-provider "1.0.1"
     events "^3.3.0"
-    pino "7.11.0"
 
-"@walletconnect/utils@2.5.2":
-  version "2.5.2"
-  resolved "https://registry.yarnpkg.com/@walletconnect/utils/-/utils-2.5.2.tgz#2ee0a10ea646f3e33e192de4b087a846e03b839f"
-  integrity sha512-s5bpY5q/RaXMc6LgPp+E7qPbKhrff9TjrLRjN2m9COnt9cERowpQEFrPzWmh10FatRZ7dNrudJ5I/c36nFc+hw==
+"@walletconnect/utils@2.7.7":
+  version "2.7.7"
+  resolved "https://registry.yarnpkg.com/@walletconnect/utils/-/utils-2.7.7.tgz#e2d8732f8ac3ffbc1de13e923891b256eb3bbefb"
+  integrity sha512-ozh9gvRAdXkiu+6nOAkoDCokDVPXK/tNATrrYuOhhR+EmGDjlZU2d27HT+HiGREdza0b1HdZN4XneGm0gERV5w==
   dependencies:
     "@stablelib/chacha20poly1305" "1.0.1"
     "@stablelib/hkdf" "1.0.1"
     "@stablelib/random" "^1.0.2"
     "@stablelib/sha256" "1.0.1"
     "@stablelib/x25519" "^1.0.3"
-    "@walletconnect/jsonrpc-utils" "^1.0.4"
     "@walletconnect/relay-api" "^1.0.9"
-    "@walletconnect/safe-json" "^1.0.1"
+    "@walletconnect/safe-json" "^1.0.2"
     "@walletconnect/time" "^1.0.2"
-    "@walletconnect/types" "2.5.2"
+    "@walletconnect/types" "2.7.7"
     "@walletconnect/window-getters" "^1.0.1"
     "@walletconnect/window-metadata" "^1.0.1"
     detect-browser "5.3.0"
-    query-string "7.1.1"
+    query-string "7.1.3"
     uint8arrays "^3.1.0"
 
 "@walletconnect/utils@^1.8.0":
@@ -7595,105 +7713,133 @@
     "@walletconnect/window-getters" "^1.0.1"
     tslib "1.14.1"
 
-"@web3-react/coinbase-wallet@^8.1.2-beta.0":
-  version "8.1.2-beta.0"
-  resolved "https://registry.yarnpkg.com/@web3-react/coinbase-wallet/-/coinbase-wallet-8.1.2-beta.0.tgz#10ad62f2f473e3299157ef610858263b8d9e98df"
-  integrity sha512-WZTvgCCb4H5fFOL9RjWhnWXgp7LTsywzi1//W/N2MGi2hOOd78AYvvOcsrd/9TdiQu4xZrl4dnriD+E55w7f8A==
+"@web3-react/coinbase-wallet@^8.2.0":
+  version "8.2.0"
+  resolved "https://registry.yarnpkg.com/@web3-react/coinbase-wallet/-/coinbase-wallet-8.2.0.tgz#038bb9e915834046320621aa49db5ba79130e488"
+  integrity sha512-SFPrsRbyw1gECyKJmE/TAB3iMhHAqh9DTa8X2FKPMgPyNPVPcha4+G0SuWy55rysh0MO6TJbj9pofX3HvXaYpw==
   dependencies:
-    "@web3-react/types" "^8.1.2-beta.0"
+    "@web3-react/types" "^8.2.0"
 
-"@web3-react/core@^8.1.2-beta.0":
-  version "8.1.2-beta.0"
-  resolved "https://registry.yarnpkg.com/@web3-react/core/-/core-8.1.2-beta.0.tgz#8bc2abb42d06db07c3b577cf8da30d1450e0fb89"
-  integrity sha512-Iv1Xq5ioWECrzsLMWMkZBUkSMHhLL8PBDKR13C+1eBRLL3xwziIsiZj9U9CI9L3NbrC2ImX6k6Tmj/kVhMoUqQ==
+"@web3-react/core@^8.2.0":
+  version "8.2.0"
+  resolved "https://registry.yarnpkg.com/@web3-react/core/-/core-8.2.0.tgz#95fb615bb283be520e6f61b5e48cfb0047943808"
+  integrity sha512-r7dmK2E8Jrpvm/DF93hGMB+8lECHSI3Oo0NrHbhxkisK6in6rdgAXeYFhZtM48LBAm9py6fQvLzjCM6Qx9q0oQ==
   dependencies:
-    "@web3-react/store" "^8.1.2-beta.0"
-    "@web3-react/types" "^8.1.2-beta.0"
+    "@web3-react/store" "^8.2.0"
+    "@web3-react/types" "^8.2.0"
     zustand "^4.3.5"
   optionalDependencies:
     "@ethersproject/providers" "^5"
 
-"@web3-react/eip1193@^8.1.2-beta.0":
-  version "8.1.2-beta.0"
-  resolved "https://registry.yarnpkg.com/@web3-react/eip1193/-/eip1193-8.1.2-beta.0.tgz#ccab0860857b622461cd164259b8cf163c6d3ab9"
-  integrity sha512-LU6ejYvscg04ziq6EiIKjJl6ou0X1knKu7ZtBjKAkoFjLyHO79WTe4ZL/JyFHxgy50OlcyiEiAEI2rghW95X5g==
+"@web3-react/eip1193@^8.2.0":
+  version "8.2.0"
+  resolved "https://registry.yarnpkg.com/@web3-react/eip1193/-/eip1193-8.2.0.tgz#a7953769f9d0bec54472aceb01f72c889458378f"
+  integrity sha512-Ugbt+FisHO8aLD5o5B4AZdtgSVpjrbmtC5MgHrOEBw+IwFqr20EJreh052u8ExI2OrPjARIVOkNcp50Xxs7oUw==
   dependencies:
-    "@web3-react/types" "^8.1.2-beta.0"
+    "@web3-react/types" "^8.2.0"
+    eventemitter3 "^4.0.7"
 
-"@web3-react/empty@^8.1.2-beta.0":
-  version "8.1.2-beta.0"
-  resolved "https://registry.yarnpkg.com/@web3-react/empty/-/empty-8.1.2-beta.0.tgz#9acd888e0ecf2d11618ccbff34ccb0f511db626c"
-  integrity sha512-DW7W8exbpAxOLSoX0mcxY3C/wgcRdemoRP+8mdjmO8NugR+XtsnTDfgIN/Z9e9hk6kp240ipvk62nAJcnNa9og==
+"@web3-react/empty@^8.2.0":
+  version "8.2.0"
+  resolved "https://registry.yarnpkg.com/@web3-react/empty/-/empty-8.2.0.tgz#dac248ab22867700b5be716cd5a3f8f95308e8c5"
+  integrity sha512-U8BIF56lW1GHXFz9cPAJnlmKM8VcsjpXr+LXNXGS+9mr5AEjNcjbn9T9EnQf4hY4YXUPHAnjsVcZoUfw3q6u7Q==
   dependencies:
-    "@web3-react/types" "^8.1.2-beta.0"
+    "@web3-react/types" "^8.2.0"
 
-"@web3-react/gnosis-safe@^8.1.2-beta.0":
-  version "8.1.2-beta.0"
-  resolved "https://registry.yarnpkg.com/@web3-react/gnosis-safe/-/gnosis-safe-8.1.2-beta.0.tgz#e97a7c70174206a4052fb70c7837463c8c683797"
-  integrity sha512-1bhkvA1jKCuqUxATs9RDbGNG309ayqO8JE8BB/1W1KKClUAtLnbbmIos3LjMykX6FIGtKpNtfcInoMS//y7CXg==
+"@web3-react/gnosis-safe@^8.2.0":
+  version "8.2.0"
+  resolved "https://registry.yarnpkg.com/@web3-react/gnosis-safe/-/gnosis-safe-8.2.0.tgz#003e7f5b335751b6699152be301256c989631b51"
+  integrity sha512-52Z1uHcnIVsyfEPjj2C+cDF21wNCMrCT6kr1JTFXkvLMfZ3LvfWOX1j+C9lOBGUyZRBe5ZtkjiLiogGqRqZYmA==
   dependencies:
     "@safe-global/safe-apps-provider" "^0.16.0"
     "@safe-global/safe-apps-sdk" "^7.10.0"
-    "@web3-react/types" "^8.1.2-beta.0"
+    "@web3-react/types" "^8.2.0"
 
-"@web3-react/metamask@^8.1.2-beta.0":
-  version "8.1.2-beta.0"
-  resolved "https://registry.yarnpkg.com/@web3-react/metamask/-/metamask-8.1.2-beta.0.tgz#671f8b9601b275a4d7ca8cc694e6530c3c35ad4b"
-  integrity sha512-nw555Q86+I5EuLJnWILQIbhAaFdKNBugCNlsO00uJYSFPh26u+5KcNVl4G+7E2cCEY4cT0OhNOOGIYSZFuWADg==
+"@web3-react/metamask@^8.2.1":
+  version "8.2.1"
+  resolved "https://registry.yarnpkg.com/@web3-react/metamask/-/metamask-8.2.1.tgz#7ffac16e2a55ff8f1195e2831a9f9f99fa0bfba9"
+  integrity sha512-JysxkAImIygkD95Bimrj7HwcTq79tq4ZSlphZt24LBMrEVY5K8k+e5mCAuJuDZ7Fu+aBxqpS0lgPjaBGKdNu/A==
   dependencies:
     "@metamask/detect-provider" "^1.2.0"
-    "@web3-react/types" "^8.1.2-beta.0"
+    "@web3-react/types" "^8.2.0"
 
-"@web3-react/network@^8.1.2-beta.0":
-  version "8.1.2-beta.0"
-  resolved "https://registry.yarnpkg.com/@web3-react/network/-/network-8.1.2-beta.0.tgz#a9246e5ab922d31a1ac0890cacee91b1394a91ed"
-  integrity sha512-aLQKpH6lUmKhz2X6C8hdw9dZBq2vRmDHy0i9+pXgbnCpGVfZ4iKzmfWB/Cj5d2WLJAyxgO6PfiGSMxL0sWFWcQ==
+"@web3-react/network@^8.2.0":
+  version "8.2.0"
+  resolved "https://registry.yarnpkg.com/@web3-react/network/-/network-8.2.0.tgz#225ae9e135711e8c64ab3123570abaa5b82b8145"
+  integrity sha512-3OcJwuaot8A+VTSoCe17MZv/K/TNVw7DjtYoS7lBRS/CmzYIwP53Tosea4MkliOuXiUUKj7Ge1D2FpWohq6pHw==
   dependencies:
     "@ethersproject/providers" "^5"
-    "@web3-react/types" "^8.1.2-beta.0"
+    "@web3-react/types" "^8.2.0"
 
-"@web3-react/store@^8.1.2-beta.0":
-  version "8.1.2-beta.0"
-  resolved "https://registry.yarnpkg.com/@web3-react/store/-/store-8.1.2-beta.0.tgz#014a402a428a483ad7bde6247210294312864148"
-  integrity sha512-Xmogyl52zSYkPILwt+LjFIlTSlwrx25IrotrONglE37Pq263k/AAMii3AlblDuUF3CWSuxnq2YPuhZ4PODVaKA==
+"@web3-react/store@^8.2.0":
+  version "8.2.0"
+  resolved "https://registry.yarnpkg.com/@web3-react/store/-/store-8.2.0.tgz#4260c7d1fca3c8e0358f32ed8909a5d8dba69a80"
+  integrity sha512-cG8nb+tBeRUJu+98ko6YZuAWmoipGMEbR3bhineCNd4x2mXv3GbWSPtE17GeWVshZgDbZu2/Du0okTx+22VWCg==
   dependencies:
     "@ethersproject/address" "^5"
-    "@web3-react/types" "^8.1.2-beta.0"
+    "@web3-react/types" "^8.2.0"
     zustand "^4.3.5"
 
-"@web3-react/types@^8.1.2-beta.0":
-  version "8.1.2-beta.0"
-  resolved "https://registry.yarnpkg.com/@web3-react/types/-/types-8.1.2-beta.0.tgz#439e3a539688e91b677a3959d2e1bf56c33eaa96"
-  integrity sha512-gvVJqRvGsABpoUZA7RWQQiOq5qv5exkUW6ouSjlO4Q5BkfCBgT4NlIUVQ91w3JnS5qkDpk/uKDMt+wDFw0Yssw==
+"@web3-react/types@^8.2.0":
+  version "8.2.0"
+  resolved "https://registry.yarnpkg.com/@web3-react/types/-/types-8.2.0.tgz#195464ebb94cb417e6dc3c16951573f9b6b3832a"
+  integrity sha512-TBYTFlqJZaEpVbuAAKRJFX5PZc3lI1TqDZzY94zwCrCh4GBepwwK7+PxmRAppMFuNa5x0vFX/ghLEC44e6TCFg==
   dependencies:
     zustand "^4.3.5"
 
-"@web3-react/url@^8.1.2-beta.0":
-  version "8.1.2-beta.0"
-  resolved "https://registry.yarnpkg.com/@web3-react/url/-/url-8.1.2-beta.0.tgz#cf8fc5b48f2a8859d88df85583316c11e2e80e65"
-  integrity sha512-bVLL5PPi1hKLSWmKpVh6BytXJ9GKBdJzW0u3wQ/xCeG9f3yPtfQhjTmAAHtVylS4Me4y4xLk8eEkQ6JLZJflAQ==
+"@web3-react/url@^8.2.0":
+  version "8.2.0"
+  resolved "https://registry.yarnpkg.com/@web3-react/url/-/url-8.2.0.tgz#5df80f213bf6b6f382aa842ae37ad0703d413a37"
+  integrity sha512-dt1i8AgZso6y0sX67JSZ1DzsU511iFu4Gcxksbw/yJPlFybsHco+Fcg94WLjWj4ec26kVRUBySUVCyXrYlg0kQ==
   dependencies:
     "@ethersproject/providers" "^5"
-    "@web3-react/types" "^8.1.2-beta.0"
+    "@web3-react/types" "^8.2.0"
 
-"@web3-react/walletconnect-v2@^8.1.2-beta.0":
-  version "8.1.2-beta.0"
-  resolved "https://registry.yarnpkg.com/@web3-react/walletconnect-v2/-/walletconnect-v2-8.1.2-beta.0.tgz#568bb79456fd44874a7dad1322aa8b297dc17aa7"
-  integrity sha512-QrgWMlAN0uG3gUo+JEc4/dsXiSUQvqCnJIjP/Vmndr5VpZ6b++YAmXKRqkJztjIedjywxBzJ1lwPt96OZZEH2Q==
+"@web3-react/walletconnect-v2@^8.3.1":
+  version "8.3.1"
+  resolved "https://registry.yarnpkg.com/@web3-react/walletconnect-v2/-/walletconnect-v2-8.3.1.tgz#7bedd71d0752d5869475d0e2ee89645b0733eb66"
+  integrity sha512-bsXOTrfj7pYsfxTjLQQvYoh7LsRh3nNYuLSJe3Ay4lGP5dhVr4a7x53arkcSRbxj9dWv15mt3Y/uBqx2t7r35g==
   dependencies:
-    "@walletconnect/ethereum-provider" "^2.4.7"
-    "@web3-react/types" "^8.1.2-beta.0"
+    "@walletconnect/ethereum-provider" "^2.7.4"
+    "@web3-react/types" "^8.2.0"
+    "@web3modal/standalone" "^2.2.1"
     eventemitter3 "^4.0.7"
 
-"@web3-react/walletconnect@^8.1.2-beta.0":
-  version "8.1.2-beta.0"
-  resolved "https://registry.yarnpkg.com/@web3-react/walletconnect/-/walletconnect-8.1.2-beta.0.tgz#c2716685aed59ad54467cc72292580acdb03976f"
-  integrity sha512-m5m1jsho6mX6ChVtfe+vDVa50VTAxe8SjcayLY690z91N7hwAdvgMbqZoaR3yj0uHT7HzpB5ucYSfJ2FFSekbQ==
+"@web3-react/walletconnect@^8.2.0":
+  version "8.2.0"
+  resolved "https://registry.yarnpkg.com/@web3-react/walletconnect/-/walletconnect-8.2.0.tgz#e4e325132f04f03a07a19cd193b4b97bfe6a9914"
+  integrity sha512-Yl1C0beRnwohtFZ9c6xz6mOci2MqoES2hYKhJI4X7qKqcmQJC6TOeLjlYfzjdUTUvP8IDf0A7flYZVeBUvL/fg==
   dependencies:
     "@walletconnect/ethereum-provider" "^1.7.8"
-    "@web3-react/types" "^8.1.2-beta.0"
+    "@web3-react/types" "^8.2.0"
     eventemitter3 "^4.0.7"
 
+"@web3modal/core@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@web3modal/core/-/core-2.4.1.tgz#9b0a60aa88ef8518de7a30bab1278b2c9f046012"
+  integrity sha512-v6Y/eQJSI2YfUTv8rGqjFabqdk3ZPjx6Fe7j5Q8fw0ZWF1YRGM3mySG457qtKQ7D7E1kNKA3BHbaOZ3pgQoG6A==
+  dependencies:
+    buffer "6.0.3"
+    valtio "1.10.5"
+
+"@web3modal/standalone@^2.2.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@web3modal/standalone/-/standalone-2.4.1.tgz#e10330583ce7b550ba676e4c595ac8ea8715bcdb"
+  integrity sha512-ZrI5LwWeT9sd8A3FdIX/gBp3ZrzrX882Ln1vJN0LTCmeP2OUsYcW5bPxjv1PcJ1YUBY7Tg4aTgMUnAVTTuqb+w==
+  dependencies:
+    "@web3modal/core" "2.4.1"
+    "@web3modal/ui" "2.4.1"
+
+"@web3modal/ui@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@web3modal/ui/-/ui-2.4.1.tgz#c1c5a8bf4cd749febd15411ec710b22215e66e56"
+  integrity sha512-x1ceyd3mMJsIHs5UUTLvE+6qyCjhyjL6gB/wVmTDbwASHSQIVyshQJ+s7BwIEMP/pbAsYDg+/M8EiUuE+/E/kg==
+  dependencies:
+    "@web3modal/core" "2.4.1"
+    lit "2.7.4"
+    motion "10.15.5"
+    qrcode "1.5.3"
+
 "@webassemblyjs/ast@1.11.1":
   version "1.11.1"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7"
@@ -8051,11 +8197,6 @@ ansi-align@^3.0.0, ansi-align@^3.0.1:
   dependencies:
     string-width "^4.1.0"
 
-ansi-colors@4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
-  integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
-
 ansi-colors@^4.1.1:
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.3.tgz#37611340eb2243e70cc604cad35d63270d48781b"
@@ -9185,11 +9326,6 @@ browser-readablestream-to-it@^1.0.1, browser-readablestream-to-it@^1.0.3:
   resolved "https://registry.yarnpkg.com/browser-readablestream-to-it/-/browser-readablestream-to-it-1.0.3.tgz#ac3e406c7ee6cdf0a502dd55db33bab97f7fba76"
   integrity sha512-+12sHB+Br8HIh6VAMVEG5r3UXCyESIgDW7kzk3BjIXa43DVqVwL7GC5TW3jeh+72dtcH99pPVpw0X8i0jt+/kw==
 
-browser-stdout@1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60"
-  integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==
-
 browserify-aes@^1.0.0, browserify-aes@^1.0.4, browserify-aes@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48"
@@ -9360,6 +9496,14 @@ buffer@6.0.1:
     base64-js "^1.3.1"
     ieee754 "^1.2.1"
 
+buffer@6.0.3, buffer@^6.0.1, buffer@^6.0.3, buffer@~6.0.3:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-6.0.3.tgz#2ace578459cc8fbe2a70aaa8f52ee63b6a74c6c6"
+  integrity sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==
+  dependencies:
+    base64-js "^1.3.1"
+    ieee754 "^1.2.1"
+
 buffer@^5.0.5, buffer@^5.2.0, buffer@^5.4.3, buffer@^5.5.0, buffer@^5.6.0:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
@@ -9368,14 +9512,6 @@ buffer@^5.0.5, buffer@^5.2.0, buffer@^5.4.3, buffer@^5.5.0, buffer@^5.6.0:
     base64-js "^1.3.1"
     ieee754 "^1.1.13"
 
-buffer@^6.0.1, buffer@^6.0.3, buffer@~6.0.3:
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/buffer/-/buffer-6.0.3.tgz#2ace578459cc8fbe2a70aaa8f52ee63b6a74c6c6"
-  integrity sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==
-  dependencies:
-    base64-js "^1.3.1"
-    ieee754 "^1.2.1"
-
 bufferutil@^4.0.1:
   version "4.0.7"
   resolved "https://registry.yarnpkg.com/bufferutil/-/bufferutil-4.0.7.tgz#60c0d19ba2c992dd8273d3f73772ffc894c153ad"
@@ -9716,7 +9852,7 @@ chokidar@3.5.1:
   optionalDependencies:
     fsevents "~2.3.1"
 
-chokidar@3.5.3, chokidar@^3.4.2, chokidar@^3.5.1, chokidar@^3.5.2, chokidar@^3.5.3:
+chokidar@^3.4.2, chokidar@^3.5.1, chokidar@^3.5.2, chokidar@^3.5.3:
   version "3.5.3"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
   integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==
@@ -11305,11 +11441,6 @@ decamelize@^1.1.0, decamelize@^1.2.0:
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
   integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==
 
-decamelize@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-4.0.0.tgz#aa472d7bf660eb15f3494efd531cab7f2a709837"
-  integrity sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==
-
 decimal.js-light@^2.5.0:
   version "2.5.1"
   resolved "https://registry.yarnpkg.com/decimal.js-light/-/decimal.js-light-2.5.1.tgz#134fd32508f19e208f4fb2f8dac0d2626a867934"
@@ -11320,7 +11451,7 @@ decimal.js@^10.2.1, decimal.js@^10.4.2:
   resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.3.tgz#1044092884d245d1b7f65725fa4ad4c6f781cc23"
   integrity sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==
 
-decode-uri-component@^0.2.0:
+decode-uri-component@^0.2.0, decode-uri-component@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9"
   integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==
@@ -11556,11 +11687,6 @@ diff-sequences@^29.4.3:
   resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.4.3.tgz#9314bc1fabe09267ffeca9cbafc457d8499a13f2"
   integrity sha512-ofrBgwpPhCD85kMKtE9RYFFq6OC1A89oW2vvgWZNCwxrUpRUILopY7lsYyMDSjc8g6U6aiO0Qubg6r4Wgt5ZnA==
 
-diff@5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-5.0.0.tgz#7ed6ad76d859d030787ec35855f5b1daf31d852b"
-  integrity sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==
-
 diff@^4.0.1:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
@@ -11947,6 +12073,11 @@ emojis-list@^3.0.0:
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
   integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==
 
+encode-utf8@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/encode-utf8/-/encode-utf8-1.0.3.tgz#f30fdd31da07fb596f281beb2f6b027851994cda"
+  integrity sha512-ucAnuBEhUK4boH2HjVYG5Q2mQyPorvv0u/ocS+zhdw0S8AlHYY+GOFhP1Gio5z4icpP2ivFSvhtFjQi8+T9ppw==
+
 encodeurl@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
@@ -12245,11 +12376,6 @@ escape-html@~1.0.3:
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
   integrity sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==
 
-escape-string-regexp@4.0.0, escape-string-regexp@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
-  integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
-
 escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
@@ -12260,6 +12386,11 @@ escape-string-regexp@^2.0.0:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344"
   integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==
 
+escape-string-regexp@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
+  integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
+
 escodegen@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz#5e32b12833e8aa8fa35e1bf0befa89380484c7dd"
@@ -13305,14 +13436,6 @@ find-root@^1.1.0:
   resolved "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz#abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4"
   integrity sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==
 
-find-up@5.0.0, find-up@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
-  integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==
-  dependencies:
-    locate-path "^6.0.0"
-    path-exists "^4.0.0"
-
 find-up@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
@@ -13335,6 +13458,14 @@ find-up@^4.0.0, find-up@^4.1.0:
     locate-path "^5.0.0"
     path-exists "^4.0.0"
 
+find-up@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
+  integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==
+  dependencies:
+    locate-path "^6.0.0"
+    path-exists "^4.0.0"
+
 find-yarn-workspace-root@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/find-yarn-workspace-root/-/find-yarn-workspace-root-2.0.0.tgz#f47fb8d239c900eb78179aa81b66673eac88f7bd"
@@ -13787,18 +13918,6 @@ glob@7.1.7:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@7.2.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
-  integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
 glob@^6.0.1:
   version "6.0.4"
   resolved "https://registry.yarnpkg.com/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22"
@@ -14151,11 +14270,16 @@ hash.js@1.1.7, hash.js@^1.0.0, hash.js@^1.0.3, hash.js@^1.1.7:
     inherits "^2.0.3"
     minimalistic-assert "^1.0.1"
 
-he@1.2.0, he@^1.2.0:
+he@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
   integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
 
+hey-listen@^1.0.8:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/hey-listen/-/hey-listen-1.0.8.tgz#8e59561ff724908de1aa924ed6ecc84a56a9aa68"
+  integrity sha512-COpmrF2NOg4TBWUJ5UVyaCU2A88wEMkUPK4hNqyCkqHbxT92BbvfjoSozkAIIm6XhicGlJHhFdullInrdhwU8Q==
+
 hi-base32@~0.5.0:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/hi-base32/-/hi-base32-0.5.1.tgz#1279f2ddae2673219ea5870c2121d2a33132857e"
@@ -17206,6 +17330,31 @@ listr2@^3.8.3:
     through "^2.3.8"
     wrap-ansi "^7.0.0"
 
+lit-element@^3.3.0:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/lit-element/-/lit-element-3.3.2.tgz#9913bf220b85065f0e5f1bb8878cc44f36b50cfa"
+  integrity sha512-xXAeVWKGr4/njq0rGC9dethMnYCq5hpKYrgQZYTzawt9YQhMiXfD+T1RgrdY3NamOxwq2aXlb0vOI6e29CKgVQ==
+  dependencies:
+    "@lit-labs/ssr-dom-shim" "^1.1.0"
+    "@lit/reactive-element" "^1.3.0"
+    lit-html "^2.7.0"
+
+lit-html@^2.7.0:
+  version "2.7.4"
+  resolved "https://registry.yarnpkg.com/lit-html/-/lit-html-2.7.4.tgz#6d75001977c206683685b9d76594a516afda2954"
+  integrity sha512-/Jw+FBpeEN+z8X6PJva5n7+0MzCVAH2yypN99qHYYkq8bI+j7I39GH+68Z/MZD6rGKDK9RpzBw7CocfmHfq6+g==
+  dependencies:
+    "@types/trusted-types" "^2.0.2"
+
+lit@2.7.4:
+  version "2.7.4"
+  resolved "https://registry.yarnpkg.com/lit/-/lit-2.7.4.tgz#ca63d27fda178dbffae0faf2c882b9910e40842c"
+  integrity sha512-cgD7xrZoYr21mbrkZIuIrj98YTMw/snJPg52deWVV4A8icLyNHI3bF70xsJeAgwTuiq5Kkd+ZR8gybSJDCPB7g==
+  dependencies:
+    "@lit/reactive-element" "^1.6.0"
+    lit-element "^3.3.0"
+    lit-html "^2.7.0"
+
 load-bmfont@^1.3.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/load-bmfont/-/load-bmfont-1.4.1.tgz#c0f5f4711a1e2ccff725a7b6078087ccfcddd3e9"
@@ -17386,14 +17535,6 @@ lodash@4, lodash@4.17.21, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lod
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
 
-log-symbols@4.1.0, log-symbols@^4.0.0, log-symbols@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503"
-  integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==
-  dependencies:
-    chalk "^4.1.0"
-    is-unicode-supported "^0.1.0"
-
 log-symbols@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-3.0.0.tgz#f3a08516a5dea893336a7dee14d18a1cfdab77c4"
@@ -17401,6 +17542,14 @@ log-symbols@^3.0.0:
   dependencies:
     chalk "^2.4.2"
 
+log-symbols@^4.0.0, log-symbols@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503"
+  integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==
+  dependencies:
+    chalk "^4.1.0"
+    is-unicode-supported "^0.1.0"
+
 log-update@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/log-update/-/log-update-4.0.0.tgz#589ecd352471f2a1c0c570287543a64dfd20e0a1"
@@ -17930,13 +18079,6 @@ minimatch@3.0.5:
   dependencies:
     brace-expansion "^1.1.7"
 
-minimatch@5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.0.1.tgz#fb9022f7528125187c92bd9e9b6366be1cf3415b"
-  integrity sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==
-  dependencies:
-    brace-expansion "^2.0.1"
-
 minimatch@^5.0.1:
   version "5.1.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.4.tgz#4e2d39d872684e97b309a9104251c3f1aa4e9d1c"
@@ -18049,33 +18191,6 @@ mnemonist@^0.38.3:
   dependencies:
     obliterator "^2.0.0"
 
-mocha@^10.2.0:
-  version "10.2.0"
-  resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.2.0.tgz#1fd4a7c32ba5ac372e03a17eef435bd00e5c68b8"
-  integrity sha512-IDY7fl/BecMwFHzoqF2sg/SHHANeBoMMXFlS9r0OXKDssYE1M5O43wUY/9BVPeIvfH2zmEbBfseqN9gBQZzXkg==
-  dependencies:
-    ansi-colors "4.1.1"
-    browser-stdout "1.3.1"
-    chokidar "3.5.3"
-    debug "4.3.4"
-    diff "5.0.0"
-    escape-string-regexp "4.0.0"
-    find-up "5.0.0"
-    glob "7.2.0"
-    he "1.2.0"
-    js-yaml "4.1.0"
-    log-symbols "4.1.0"
-    minimatch "5.0.1"
-    ms "2.1.3"
-    nanoid "3.3.3"
-    serialize-javascript "6.0.0"
-    strip-json-comments "3.1.1"
-    supports-color "8.1.1"
-    workerpool "6.2.1"
-    yargs "16.2.0"
-    yargs-parser "20.2.4"
-    yargs-unparser "2.0.0"
-
 mock-fs@^4.1.0:
   version "4.14.0"
   resolved "https://registry.yarnpkg.com/mock-fs/-/mock-fs-4.14.0.tgz#ce5124d2c601421255985e6e94da80a7357b1b18"
@@ -18091,6 +18206,18 @@ moo@^0.5.1:
   resolved "https://registry.yarnpkg.com/moo/-/moo-0.5.2.tgz#f9fe82473bc7c184b0d32e2215d3f6e67278733c"
   integrity sha512-iSAJLHYKnX41mKcJKjqvnAN9sf0LMDTXDEvFv+ffuRR9a1MIuXLjMNL6EsnDHSkKLTWNqQQ5uo61P4EbU4NU+Q==
 
+motion@10.15.5:
+  version "10.15.5"
+  resolved "https://registry.yarnpkg.com/motion/-/motion-10.15.5.tgz#d336ddbdd37bc28bb99fbb243fe309df6c685ad6"
+  integrity sha512-ejP6KioN4pigTGxL93APzOnvtLklParL59UQB2T3HWXQBxFcIp5/7YXFmkgiA6pNKKzjvnLhnonRBN5iSFMnNw==
+  dependencies:
+    "@motionone/animation" "^10.15.1"
+    "@motionone/dom" "^10.15.5"
+    "@motionone/svelte" "^10.15.5"
+    "@motionone/types" "^10.15.1"
+    "@motionone/utils" "^10.15.1"
+    "@motionone/vue" "^10.15.5"
+
 mrmime@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/mrmime/-/mrmime-1.0.1.tgz#5f90c825fad4bdd41dc914eff5d1a8cfdaf24f27"
@@ -18321,11 +18448,6 @@ nanoclone@^0.2.1:
   resolved "https://registry.yarnpkg.com/nanoclone/-/nanoclone-0.2.1.tgz#dd4090f8f1a110d26bb32c49ed2f5b9235209ed4"
   integrity sha512-wynEP02LmIbLpcYw8uBKpcfF6dmg2vcpKqxeH5UcoKEYdExslsdUA4ugFauuaeYdTB76ez6gJW8XAZ6CgkXYxA==
 
-nanoid@3.3.3:
-  version "3.3.3"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.3.tgz#fd8e8b7aa761fe807dba2d1b98fb7241bb724a25"
-  integrity sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w==
-
 nanoid@^3.0.2, nanoid@^3.1.12, nanoid@^3.1.20, nanoid@^3.1.3, nanoid@^3.3.1, nanoid@^3.3.4:
   version "3.3.4"
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab"
@@ -19453,6 +19575,11 @@ pngjs@^3.0.0, pngjs@^3.3.0, pngjs@^3.3.3:
   resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-3.4.0.tgz#99ca7d725965fb655814eaf65f38f12bbdbf555f"
   integrity sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w==
 
+pngjs@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-5.0.0.tgz#e79dd2b215767fd9c04561c01236df960bce7fbb"
+  integrity sha512-40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw==
+
 pofile@^1.1.0:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/pofile/-/pofile-1.1.4.tgz#eab7e29f5017589b2a61b2259dff608c0cad76a2"
@@ -20241,6 +20368,11 @@ proxy-addr@~2.0.7:
     forwarded "0.2.0"
     ipaddr.js "1.9.1"
 
+proxy-compare@2.5.1:
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/proxy-compare/-/proxy-compare-2.5.1.tgz#17818e33d1653fbac8c2ec31406bce8a2966f600"
+  integrity sha512-oyfc0Tx87Cpwva5ZXezSp5V9vht1c7dZBhvuV/y3ctkgMVUmiAGDVeeB0dKhGSyT0v1ZTEQYpe/RXlBVBNuCLA==
+
 proxy-from-env@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.0.0.tgz#33c50398f70ea7eb96d21f7b817630a55791c7ee"
@@ -20352,6 +20484,16 @@ qrcode@1.4.4:
     pngjs "^3.3.0"
     yargs "^13.2.4"
 
+qrcode@1.5.3:
+  version "1.5.3"
+  resolved "https://registry.yarnpkg.com/qrcode/-/qrcode-1.5.3.tgz#03afa80912c0dccf12bc93f615a535aad1066170"
+  integrity sha512-puyri6ApkEHYiVl4CFzo1tDkAZ+ATcnbJrJ6RiBM1Fhctdn/ix9MTE3hRph33omisEbC/2fcfemsseiKgBPKZg==
+  dependencies:
+    dijkstrajs "^1.0.1"
+    encode-utf8 "^1.0.3"
+    pngjs "^5.0.0"
+    yargs "^15.3.1"
+
 qs@6.11.0, qs@^6.10.3, qs@^6.5.1, qs@^6.9.1:
   version "6.11.0"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a"
@@ -20396,12 +20538,12 @@ query-string@6.13.5:
     split-on-first "^1.0.0"
     strict-uri-encode "^2.0.0"
 
-query-string@7.1.1:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/query-string/-/query-string-7.1.1.tgz#754620669db978625a90f635f12617c271a088e1"
-  integrity sha512-MplouLRDHBZSG9z7fpuAAcI7aAYjDLhtsiVZsevsfaHWDS2IDdORKbSd1kWUA+V4zyva/HZoSfpwnYMMQDhb0w==
+query-string@7.1.3:
+  version "7.1.3"
+  resolved "https://registry.yarnpkg.com/query-string/-/query-string-7.1.3.tgz#a1cf90e994abb113a325804a972d98276fe02328"
+  integrity sha512-hh2WYhq4fi8+b+/2Kg9CEge4fDPvHS534aOOvOZeQ3+Vf2mCFsaFBYj0i+iXcAq6I9Vzp5fjMFBlONvayDC1qg==
   dependencies:
-    decode-uri-component "^0.2.0"
+    decode-uri-component "^0.2.2"
     filter-obj "^1.1.0"
     split-on-first "^1.0.0"
     strict-uri-encode "^2.0.0"
@@ -21810,13 +21952,6 @@ send@0.18.0:
     range-parser "~1.2.1"
     statuses "2.0.1"
 
-serialize-javascript@6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8"
-  integrity sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==
-  dependencies:
-    randombytes "^2.1.0"
-
 serialize-javascript@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz#b525e1238489a5ecfc42afacc3fe99e666f4b1aa"
@@ -22670,7 +22805,7 @@ strip-indent@^3.0.0:
   dependencies:
     min-indent "^1.0.0"
 
-strip-json-comments@3.1.1, strip-json-comments@^3.1.0, strip-json-comments@^3.1.1, strip-json-comments@~3.1.1:
+strip-json-comments@^3.1.0, strip-json-comments@^3.1.1, strip-json-comments@~3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
@@ -22763,13 +22898,6 @@ superstruct@^0.14.2:
   resolved "https://registry.yarnpkg.com/superstruct/-/superstruct-0.14.2.tgz#0dbcdf3d83676588828f1cf5ed35cda02f59025b"
   integrity sha512-nPewA6m9mR3d6k7WkZ8N8zpTWfenFH3q9pA2PkuiZxINr9DKB2+40wEQf0ixn8VaGuJ78AB6iWOtStI+/4FKZQ==
 
-supports-color@8.1.1, supports-color@^8.0.0, supports-color@^8.1.1:
-  version "8.1.1"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"
-  integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==
-  dependencies:
-    has-flag "^4.0.0"
-
 supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
@@ -22789,6 +22917,13 @@ supports-color@^7.0.0, supports-color@^7.1.0:
   dependencies:
     has-flag "^4.0.0"
 
+supports-color@^8.0.0, supports-color@^8.1.1:
+  version "8.1.1"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"
+  integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==
+  dependencies:
+    has-flag "^4.0.0"
+
 supports-hyperlinks@^2.0.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz#3943544347c1ff90b15effb03fc14ae45ec10624"
@@ -23392,7 +23527,7 @@ ts-morph@17.0.1:
     "@ts-morph/common" "~0.18.0"
     code-block-writer "^11.0.3"
 
-ts-node@10.9.1, ts-node@^10.7.0, ts-node@^10.8.1, ts-node@^10.9.1:
+ts-node@10.9.1, ts-node@^10.7.0, ts-node@^10.8.1:
   version "10.9.1"
   resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.1.tgz#e73de9102958af9e1f0b168a6ff320e25adcff4b"
   integrity sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==
@@ -23445,7 +23580,7 @@ tslib@^2.0.0, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.4.1:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.1.tgz#0d0bfbaac2880b91e22df0768e55be9753a5b17e"
   integrity sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==
 
-tslib@^2.3.0, tslib@^2.4.0:
+tslib@^2.3.0, tslib@^2.3.1, tslib@^2.4.0:
   version "2.5.3"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.3.tgz#24944ba2d990940e6e982c4bea147aba80209913"
   integrity sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==
@@ -24051,6 +24186,14 @@ validator@13.9.0, validator@^13.7.0:
   resolved "https://registry.yarnpkg.com/validator/-/validator-13.9.0.tgz#33e7b85b604f3bbce9bb1a05d5c3e22e1c2ff855"
   integrity sha512-B+dGG8U3fdtM0/aNK4/X8CXq/EcxU2WPrPEkJGslb47qyHsxmbggTWK0yEA4qnYVNF+nxNlN88o14hIcPmSIEA==
 
+valtio@1.10.5:
+  version "1.10.5"
+  resolved "https://registry.yarnpkg.com/valtio/-/valtio-1.10.5.tgz#7852125e3b774b522827d96bd9c76d285c518678"
+  integrity sha512-jTp0k63VXf4r5hPoaC6a6LCG4POkVSh629WLi1+d5PlajLsbynTMd7qAgEiOSPxzoX5iNvbN7iZ/k/g29wrNiQ==
+  dependencies:
+    proxy-compare "2.5.1"
+    use-sync-external-store "1.2.0"
+
 varint@^5.0.0, varint@^5.0.2, varint@~5.0.0:
   version "5.0.2"
   resolved "https://registry.yarnpkg.com/varint/-/varint-5.0.2.tgz#5b47f8a947eb668b848e034dcfa87d0ff8a7f7a4"
@@ -25196,11 +25339,6 @@ workbox-window@6.5.4:
     "@types/trusted-types" "^2.0.2"
     workbox-core "6.5.4"
 
-workerpool@6.2.1:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.1.tgz#46fc150c17d826b86a008e5a4508656777e9c343"
-  integrity sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw==
-
 wrap-ansi@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-4.0.0.tgz#b3570d7c70156159a2d42be5cc942e957f7b1131"
@@ -25423,11 +25561,6 @@ yaml@^1.10.0, yaml@^1.10.2, yaml@^1.7.2:
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
   integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
 
-yargs-parser@20.2.4:
-  version "20.2.4"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54"
-  integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==
-
 yargs-parser@21.1.1, yargs-parser@>=21.1.1, yargs-parser@^21.0.1, yargs-parser@^21.1.1:
   version "21.1.1"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
@@ -25461,29 +25594,6 @@ yargs-parser@^20.2.2, yargs-parser@^20.2.3:
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
   integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
 
-yargs-unparser@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/yargs-unparser/-/yargs-unparser-2.0.0.tgz#f131f9226911ae5d9ad38c432fe809366c2325eb"
-  integrity sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==
-  dependencies:
-    camelcase "^6.0.0"
-    decamelize "^4.0.0"
-    flat "^5.0.2"
-    is-plain-obj "^2.1.0"
-
-yargs@16.2.0, yargs@^16.2.0:
-  version "16.2.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66"
-  integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==
-  dependencies:
-    cliui "^7.0.2"
-    escalade "^3.1.1"
-    get-caller-file "^2.0.5"
-    require-directory "^2.1.1"
-    string-width "^4.2.0"
-    y18n "^5.0.5"
-    yargs-parser "^20.2.2"
-
 yargs@^13.2.4:
   version "13.3.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"
@@ -25500,7 +25610,7 @@ yargs@^13.2.4:
     y18n "^4.0.0"
     yargs-parser "^13.1.2"
 
-yargs@^15.4.1:
+yargs@^15.3.1, yargs@^15.4.1:
   version "15.4.1"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8"
   integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==
@@ -25517,6 +25627,19 @@ yargs@^15.4.1:
     y18n "^4.0.0"
     yargs-parser "^18.1.2"
 
+yargs@^16.2.0:
+  version "16.2.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66"
+  integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==
+  dependencies:
+    cliui "^7.0.2"
+    escalade "^3.1.1"
+    get-caller-file "^2.0.5"
+    require-directory "^2.1.1"
+    string-width "^4.2.0"
+    y18n "^5.0.5"
+    yargs-parser "^20.2.2"
+
 yargs@^17.0.0:
   version "17.7.1"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.1.tgz#34a77645201d1a8fc5213ace787c220eabbd0967"

From 0e51e16ff54c0cc965d92249806135eafee1ce24 Mon Sep 17 00:00:00 2001
From: Anxo Rodriguez <anxolin@gmail.com>
Date: Wed, 28 Jun 2023 08:56:09 +0100
Subject: [PATCH 35/67] fix: fix cosmos on dev (#2733)

---
 src/legacy/components/AmplitudeAnalytics/index.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/legacy/components/AmplitudeAnalytics/index.ts b/src/legacy/components/AmplitudeAnalytics/index.ts
index d6533cc94d..1d34f1f510 100644
--- a/src/legacy/components/AmplitudeAnalytics/index.ts
+++ b/src/legacy/components/AmplitudeAnalytics/index.ts
@@ -7,9 +7,10 @@ import { Identify, identify, init, track } from '@amplitude/analytics-browser'
  * member of the organization on Amplitude to view details.
  */
 export function initializeAnalytics(isDevEnvironment = process.env.NODE_ENV === 'development') {
-  if (isDevEnvironment) return
-
   const API_KEY = process.env.REACT_APP_AMPLITUDE_KEY
+
+  if (isDevEnvironment || !API_KEY) return
+
   if (typeof API_KEY === 'undefined') {
     throw new Error(`REACT_APP_AMPLITUDE_KEY must be a defined environment variable`)
   }

From 29280fe3ff685a0d00e340ec88fa6d1bcb31ea6e Mon Sep 17 00:00:00 2001
From: Alfetopito <alfetopito@users.noreply.github.com>
Date: Wed, 28 Jun 2023 09:09:40 +0100
Subject: [PATCH 36/67] Revert "fix: fix cosmos on dev (#2733)"

This reverts commit 0e51e16ff54c0cc965d92249806135eafee1ce24.
---
 src/legacy/components/AmplitudeAnalytics/index.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/legacy/components/AmplitudeAnalytics/index.ts b/src/legacy/components/AmplitudeAnalytics/index.ts
index 1d34f1f510..d6533cc94d 100644
--- a/src/legacy/components/AmplitudeAnalytics/index.ts
+++ b/src/legacy/components/AmplitudeAnalytics/index.ts
@@ -7,10 +7,9 @@ import { Identify, identify, init, track } from '@amplitude/analytics-browser'
  * member of the organization on Amplitude to view details.
  */
 export function initializeAnalytics(isDevEnvironment = process.env.NODE_ENV === 'development') {
-  const API_KEY = process.env.REACT_APP_AMPLITUDE_KEY
-
-  if (isDevEnvironment || !API_KEY) return
+  if (isDevEnvironment) return
 
+  const API_KEY = process.env.REACT_APP_AMPLITUDE_KEY
   if (typeof API_KEY === 'undefined') {
     throw new Error(`REACT_APP_AMPLITUDE_KEY must be a defined environment variable`)
   }

From e353226c1e63ec2bdb6b4c44f758db2979a37dfe Mon Sep 17 00:00:00 2001
From: Nenad Vracar <34926005+nenadV91@users.noreply.github.com>
Date: Wed, 28 Jun 2023 14:36:26 +0200
Subject: [PATCH 37/67] chore: update wallet-connect package version (#2731)

* chore: update wallet-connect package version

* chore: update version to 8.3.6

* feat: add tooltip to v1 about sunset

* fix: some UI issues

* fix: make fonts a bit smaller
---
 package.json                                  |   2 +-
 .../api/pure/ConnectWalletOption/index.tsx    |   9 +-
 .../web3-react/connection/walletConnect.tsx   |  25 ++-
 .../web3-react/connection/walletConnectV2.tsx |  16 +-
 yarn.lock                                     | 175 +++++++++---------
 5 files changed, 120 insertions(+), 107 deletions(-)

diff --git a/package.json b/package.json
index 3d8f28706f..5dedd26d4f 100644
--- a/package.json
+++ b/package.json
@@ -129,7 +129,7 @@
     "@web3-react/types": "^8.2.0",
     "@web3-react/url": "^8.2.0",
     "@web3-react/walletconnect": "^8.2.0",
-    "@web3-react/walletconnect-v2": "^8.3.1",
+    "@web3-react/walletconnect-v2": "^8.3.6",
     "ajv": "^6.12.3",
     "bnc-sdk": "^4.6.0",
     "buffer": "^6.0.3",
diff --git a/src/modules/wallet/api/pure/ConnectWalletOption/index.tsx b/src/modules/wallet/api/pure/ConnectWalletOption/index.tsx
index f75c9eab9b..3968af2a35 100644
--- a/src/modules/wallet/api/pure/ConnectWalletOption/index.tsx
+++ b/src/modules/wallet/api/pure/ConnectWalletOption/index.tsx
@@ -31,9 +31,9 @@ const OptionCardLeft = styled.div`
   height: 100%;
 `
 
-export const OptionCardClickable = styled(OptionCard as any)<{ clickable?: boolean }>`
+export const OptionCardClickable = styled(OptionCard as any)<{ clickable?: boolean; isDeprecated?: boolean }>`
   margin-top: 0;
-  opacity: ${({ disabled }) => (disabled ? '0.5' : '1')};
+  opacity: ${({ isDeprecated }) => (isDeprecated ? '0.5' : '1')};
   background-color: ${({ theme, active }) => (active ? theme.bg2 : theme.grey1)};
   color: ${({ theme, active }) => (active ? theme.white : theme.text1)};
 
@@ -78,7 +78,7 @@ const CircleWrapper = styled.div`
 
 export const HeaderText = styled.div`
   ${({ theme }) => theme.flexRowNoWrap};
-  font-size: 0.8rem;
+  font-size: 0.7rem;
   font-weight: 400;
   white-space: nowrap;
 `
@@ -113,6 +113,7 @@ export interface ConnectWalletOptionProps {
   isActive?: boolean
   id: string
   tooltipText?: string | null
+  isDeprecated?: boolean
 }
 
 export function ConnectWalletOption({
@@ -125,6 +126,7 @@ export function ConnectWalletOption({
   subheader = null,
   icon,
   isActive = false,
+  isDeprecated = false,
   id,
   tooltipText,
 }: ConnectWalletOptionProps) {
@@ -135,6 +137,7 @@ export function ConnectWalletOption({
       clickable={clickable && !isActive}
       active={isActive}
       data-testid="wallet-modal-option"
+      isDeprecated={isDeprecated}
     >
       <OptionCardLeft>
         <IconWrapper size={size}>
diff --git a/src/modules/wallet/web3-react/connection/walletConnect.tsx b/src/modules/wallet/web3-react/connection/walletConnect.tsx
index 77ba0102fe..aaf60cd947 100644
--- a/src/modules/wallet/web3-react/connection/walletConnect.tsx
+++ b/src/modules/wallet/web3-react/connection/walletConnect.tsx
@@ -1,3 +1,5 @@
+import { useMemo } from 'react'
+
 import { initializeConnector } from '@web3-react/core'
 import { WalletConnect } from '@web3-react/walletconnect'
 
@@ -17,10 +19,17 @@ import {
 } from 'modules/wallet/api/utils/connection'
 import { WC_DISABLED_TEXT } from 'modules/wallet/constants'
 
+import { useFeatureFlags } from 'common/hooks/featureFlags/useFeatureFlags'
+
 import { TryActivation, onError } from '.'
 
 import { Web3ReactConnection } from '../types'
 
+const WC_SUNSET_LINK =
+  'https://medium.com/walletconnect/weve-reset-the-clock-on-the-walletconnect-v1-0-shutdown-now-scheduled-for-june-28-2023-ead2d953b595'
+const WC_SUNSET_TEXT =
+  'The WalletConnect v1.0 protocol has been shut down on June 28, 2023 at 2pm (UTC). Click to read more.'
+
 export const walletConnectOption = {
   color: '#4196FC',
   icon: WalletConnectImage,
@@ -46,6 +55,7 @@ export const walletConnectConnection: Web3ReactConnection = {
 
 export function WalletConnectOption({ tryActivation }: { tryActivation: TryActivation }) {
   const { walletName } = useWalletMetaData()
+  const { walletConnectV1Deprecated: isDeprecated } = useFeatureFlags()
 
   const isWalletConnect = useIsActiveWallet(walletConnectConnection)
   const isActive =
@@ -54,15 +64,26 @@ export function WalletConnectOption({ tryActivation }: { tryActivation: TryActiv
     !getIsAmbireWallet(walletName) &&
     !getIsAlphaWallet(walletName) &&
     !getIsTrustWallet(null, walletName)
-  const tooltipText = !isActive && isWalletConnect ? WC_DISABLED_TEXT : null
+
+  const tooltipText = useMemo(() => {
+    if (isDeprecated) {
+      return WC_SUNSET_TEXT
+    }
+
+    return !isActive && isWalletConnect ? WC_DISABLED_TEXT : null
+  }, [isActive, isWalletConnect, isDeprecated])
+
+  const link = isDeprecated ? WC_SUNSET_LINK : null
 
   return (
     <ConnectWalletOption
       {...walletConnectOption}
       isActive={isActive}
+      isDeprecated={isDeprecated}
       tooltipText={tooltipText}
       clickable={!isWalletConnect}
-      onClick={() => tryActivation(walletConnectConnection.connector)}
+      link={link}
+      onClick={() => (!isDeprecated ? tryActivation(walletConnectConnection.connector) : null)}
       header={getConnectionName(ConnectionType.WALLET_CONNECT)}
     />
   )
diff --git a/src/modules/wallet/web3-react/connection/walletConnectV2.tsx b/src/modules/wallet/web3-react/connection/walletConnectV2.tsx
index 295f71a744..9c6addb21a 100644
--- a/src/modules/wallet/web3-react/connection/walletConnectV2.tsx
+++ b/src/modules/wallet/web3-react/connection/walletConnectV2.tsx
@@ -1,5 +1,3 @@
-import { useMemo } from 'react'
-
 import { initializeConnector } from '@web3-react/core'
 
 import { RPC_URLS } from 'legacy/constants/networks'
@@ -17,8 +15,6 @@ import {
 } from 'modules/wallet/api/utils/connection'
 import { WC_DISABLED_TEXT } from 'modules/wallet/constants'
 
-import { useFeatureFlags } from 'common/hooks/featureFlags/useFeatureFlags'
-
 import { TryActivation, onError } from '.'
 
 import { AsyncConnector } from './asyncConnector'
@@ -27,7 +23,8 @@ import { Web3ReactConnection } from '../types'
 
 const WC_PROJECT_ID = process.env.REACT_APP_WC_PROJECT_ID
 const WC_DEFAULT_PROJECT_ID = 'a6cc11517a10f6f12953fd67b1eb67e7'
-const TOOLTIP_TEXT = 'Under development and unsupported by most wallets'
+const TOOLTIP_TEXT =
+  'Currently in development and not widely adopted yet. If you are experiencing issues, contact your wallet provider.'
 
 export const walletConnectV2Option = {
   color: '#4196FC',
@@ -67,7 +64,6 @@ export const walletConnectConnectionV2: Web3ReactConnection = {
 
 export function WalletConnectV2Option({ tryActivation }: { tryActivation: TryActivation }) {
   const { walletName } = useWalletMetaData()
-  const { walletConnectV1Enabled } = useFeatureFlags()
 
   const isWalletConnect = useIsActiveWallet(walletConnectConnectionV2)
   const isActive =
@@ -77,13 +73,7 @@ export function WalletConnectV2Option({ tryActivation }: { tryActivation: TryAct
     !getIsAlphaWallet(walletName) &&
     !getIsTrustWallet(null, walletName)
 
-  const tooltipText = useMemo(() => {
-    if (walletConnectV1Enabled) {
-      return TOOLTIP_TEXT
-    }
-
-    return !isActive && isWalletConnect ? WC_DISABLED_TEXT : null
-  }, [isActive, isWalletConnect, walletConnectV1Enabled])
+  const tooltipText = !isActive && isWalletConnect ? WC_DISABLED_TEXT : TOOLTIP_TEXT
 
   return (
     <ConnectWalletOption
diff --git a/yarn.lock b/yarn.lock
index ebf471521b..8b85efb5ab 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4039,7 +4039,7 @@
     "@motionone/utils" "^10.15.1"
     tslib "^2.3.1"
 
-"@motionone/dom@^10.15.5", "@motionone/dom@^10.16.2":
+"@motionone/dom@^10.16.2":
   version "10.16.2"
   resolved "https://registry.yarnpkg.com/@motionone/dom/-/dom-10.16.2.tgz#0c44df8ee3d1cfc50ee11d27050b27824355a61a"
   integrity sha512-bnuHdNbge1FutZXv+k7xub9oPWcF0hsu8y1HTH/qg6av58YI0VufZ3ngfC7p2xhMJMnoh0LXFma2EGTgPeCkeg==
@@ -4068,7 +4068,7 @@
     "@motionone/utils" "^10.15.1"
     tslib "^2.3.1"
 
-"@motionone/svelte@^10.15.5":
+"@motionone/svelte@^10.16.2":
   version "10.16.2"
   resolved "https://registry.yarnpkg.com/@motionone/svelte/-/svelte-10.16.2.tgz#0b37c3b12927814d31d24941d1ca0ff49981b444"
   integrity sha512-38xsroKrfK+aHYhuQlE6eFcGy0EwrB43Q7RGjF73j/kRUTcLNu/LAaKiLLsN5lyqVzCgTBVt4TMT/ShWbTbc5Q==
@@ -4090,7 +4090,7 @@
     hey-listen "^1.0.8"
     tslib "^2.3.1"
 
-"@motionone/vue@^10.15.5":
+"@motionone/vue@^10.16.2":
   version "10.16.2"
   resolved "https://registry.yarnpkg.com/@motionone/vue/-/vue-10.16.2.tgz#faf13afc27620a2df870c71c58a04ee8de8dea65"
   integrity sha512-7/dEK/nWQXOkJ70bqb2KyNfSWbNvWqKKq1C8juj+0Mg/AorgD8O5wE3naddK0G+aXuNMqRuc4jlsYHHWHtIzVw==
@@ -7289,10 +7289,10 @@
     "@walletconnect/types" "^1.8.0"
     "@walletconnect/utils" "^1.8.0"
 
-"@walletconnect/core@2.7.7":
-  version "2.7.7"
-  resolved "https://registry.yarnpkg.com/@walletconnect/core/-/core-2.7.7.tgz#49ddaa9d8aff365cd347b951d9b4c1c39a949e83"
-  integrity sha512-/Tmrjx9XDG8qylsUFU2fWvMoxlDwW+zzUcCgTaebMAmssCZ8NSknbBdjAdAKiey1TaLEgFkaCxXgXfioinWNYg==
+"@walletconnect/core@2.8.4":
+  version "2.8.4"
+  resolved "https://registry.yarnpkg.com/@walletconnect/core/-/core-2.8.4.tgz#fc207c8fa35a53e30012b0c85b6ca933cec7d955"
+  integrity sha512-3CQHud4As0kPRvlW1w/wSWS2F3yXlAo5kSEJyRWLRPqXG+aSCVWM8cVM8ch5yoeyNIfOHhEINdsYMuJG1+yIJQ==
   dependencies:
     "@walletconnect/heartbeat" "1.2.1"
     "@walletconnect/jsonrpc-provider" "1.0.13"
@@ -7305,8 +7305,8 @@
     "@walletconnect/relay-auth" "^1.0.4"
     "@walletconnect/safe-json" "^1.0.2"
     "@walletconnect/time" "^1.0.2"
-    "@walletconnect/types" "2.7.7"
-    "@walletconnect/utils" "2.7.7"
+    "@walletconnect/types" "2.8.4"
+    "@walletconnect/utils" "2.8.4"
     events "^3.3.0"
     lodash.isequal "4.5.0"
     uint8arrays "^3.1.0"
@@ -7362,19 +7362,19 @@
     eip1193-provider "1.0.1"
     eventemitter3 "4.0.7"
 
-"@walletconnect/ethereum-provider@^2.7.4":
-  version "2.7.7"
-  resolved "https://registry.yarnpkg.com/@walletconnect/ethereum-provider/-/ethereum-provider-2.7.7.tgz#1b7b934c0a4f7a504174d28006c964f48523ee01"
-  integrity sha512-wVVMgpMMcPySBKHAPu7QfL18TMrjAgOePz/mfuOjWal+vT9yVSPA34oFyHlzJKvcQ/abP7Zj3AzDtZbyXWRxwQ==
+"@walletconnect/ethereum-provider@^2.8.4":
+  version "2.8.4"
+  resolved "https://registry.yarnpkg.com/@walletconnect/ethereum-provider/-/ethereum-provider-2.8.4.tgz#c627c237b479194efc542b8475596bae12fde52d"
+  integrity sha512-z7Yz4w8t3eEFv8vQ8DLCgDWPah2aIIyC0iQdwhXgJenQTVuz7JJZRrJUUntzudipHK/owA394c1qTPF0rsMSeQ==
   dependencies:
     "@walletconnect/jsonrpc-http-connection" "^1.0.7"
     "@walletconnect/jsonrpc-provider" "^1.0.13"
     "@walletconnect/jsonrpc-types" "^1.0.3"
     "@walletconnect/jsonrpc-utils" "^1.0.8"
-    "@walletconnect/sign-client" "2.7.7"
-    "@walletconnect/types" "2.7.7"
-    "@walletconnect/universal-provider" "2.7.7"
-    "@walletconnect/utils" "2.7.7"
+    "@walletconnect/sign-client" "2.8.4"
+    "@walletconnect/types" "2.8.4"
+    "@walletconnect/universal-provider" "2.8.4"
+    "@walletconnect/utils" "2.8.4"
     events "^3.3.0"
 
 "@walletconnect/events@^1.0.1":
@@ -7516,6 +7516,32 @@
   resolved "https://registry.yarnpkg.com/@walletconnect/mobile-registry/-/mobile-registry-1.4.0.tgz#502cf8ab87330841d794819081e748ebdef7aee5"
   integrity sha512-ZtKRio4uCZ1JUF7LIdecmZt7FOLnX72RPSY7aUVu7mj7CSfxDwUn6gBuK6WGtH+NZCldBqDl5DenI5fFSvkKYw==
 
+"@walletconnect/modal-core@2.5.4":
+  version "2.5.4"
+  resolved "https://registry.yarnpkg.com/@walletconnect/modal-core/-/modal-core-2.5.4.tgz#7d739a90a9cf103067eea46507ea649e8dada436"
+  integrity sha512-ISe4LqmEDFU7b6rLgonqaEtMXzG6ko13HA7S8Ty3d7GgfAEe29LM1dq3zo8ehEOghhofhj1PiiNfvaogZKzT1g==
+  dependencies:
+    buffer "6.0.3"
+    valtio "1.10.6"
+
+"@walletconnect/modal-ui@2.5.4":
+  version "2.5.4"
+  resolved "https://registry.yarnpkg.com/@walletconnect/modal-ui/-/modal-ui-2.5.4.tgz#0433fb0226dd47e17fede620c5a5ff332baed155"
+  integrity sha512-5qLLjwbE3YC4AsCVhf8J87otklkApcQ5DCMykOcS0APPv8lKQ46JxpQhfWwRYaUkuIiHonI9h1YxFARDkoaI9g==
+  dependencies:
+    "@walletconnect/modal-core" "2.5.4"
+    lit "2.7.5"
+    motion "10.16.2"
+    qrcode "1.5.3"
+
+"@walletconnect/modal@^2.4.5":
+  version "2.5.4"
+  resolved "https://registry.yarnpkg.com/@walletconnect/modal/-/modal-2.5.4.tgz#66659051f9c0f35c151d3a8d940f8c64d42fab74"
+  integrity sha512-JAKMcCd4JQvSEr7pNitg3OBke4DN1JyaQ7bdi3x4T7oLgOr9Y88qdkeOXko/0aJonDHJsM88hZ10POQWmKfEMA==
+  dependencies:
+    "@walletconnect/modal-core" "2.5.4"
+    "@walletconnect/modal-ui" "2.5.4"
+
 "@walletconnect/qrcode-modal@^1.8.0":
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/@walletconnect/qrcode-modal/-/qrcode-modal-1.8.0.tgz#ddd6f5c9b7ee52c16adf9aacec2a3eac4994caea"
@@ -7577,19 +7603,19 @@
   dependencies:
     tslib "1.14.1"
 
-"@walletconnect/sign-client@2.7.7":
-  version "2.7.7"
-  resolved "https://registry.yarnpkg.com/@walletconnect/sign-client/-/sign-client-2.7.7.tgz#a2be064eaff37ab036919bd33f1cf9ddf4681fdd"
-  integrity sha512-lTyF8ZEp+HwPNBW/Fw5iWnMm9O5tC1qwf5YfhNczZ7+q6+UUopOoRrsAvwqftJIkgKmfC8lHT52G/XM2JGVjbQ==
+"@walletconnect/sign-client@2.8.4":
+  version "2.8.4"
+  resolved "https://registry.yarnpkg.com/@walletconnect/sign-client/-/sign-client-2.8.4.tgz#35e7cfe9442c65d7f667a7c20f1a5ee7e2a6e576"
+  integrity sha512-eRvWtKBAgzo/rbIkw+rkKco2ulSW8Wor/58UsOBsl9DKr1rIazZd4ZcUdaTjg9q8AT1476IQakCAIuv+1FvJwQ==
   dependencies:
-    "@walletconnect/core" "2.7.7"
+    "@walletconnect/core" "2.8.4"
     "@walletconnect/events" "^1.0.1"
     "@walletconnect/heartbeat" "1.2.1"
     "@walletconnect/jsonrpc-utils" "1.0.8"
     "@walletconnect/logger" "^2.0.1"
     "@walletconnect/time" "^1.0.2"
-    "@walletconnect/types" "2.7.7"
-    "@walletconnect/utils" "2.7.7"
+    "@walletconnect/types" "2.8.4"
+    "@walletconnect/utils" "2.8.4"
     events "^3.3.0"
 
 "@walletconnect/signer-connection@^1.8.0":
@@ -7620,10 +7646,10 @@
   dependencies:
     tslib "1.14.1"
 
-"@walletconnect/types@2.7.7":
-  version "2.7.7"
-  resolved "https://registry.yarnpkg.com/@walletconnect/types/-/types-2.7.7.tgz#c02831a17b6162d8594c45e3cc4668015e022f51"
-  integrity sha512-Z4Y+BKPX7X1UBCf7QV35mVy2QU9CS+5G+EthCaJwpieirZNHamHEwNXUjuUUb3PrYOLwlfRYUT5edeFW9wvoeQ==
+"@walletconnect/types@2.8.4":
+  version "2.8.4"
+  resolved "https://registry.yarnpkg.com/@walletconnect/types/-/types-2.8.4.tgz#23fad8593b094c7564d72f179e33b1cac9324a88"
+  integrity sha512-Fgqe87R7rjMOGSvx28YPLTtXM6jj+oUOorx8cE+jEw2PfpWp5myF21aCdaMBR39h0QHij5H1Z0/W9e7gm4oC1Q==
   dependencies:
     "@walletconnect/events" "^1.0.1"
     "@walletconnect/heartbeat" "1.2.1"
@@ -7637,26 +7663,25 @@
   resolved "https://registry.yarnpkg.com/@walletconnect/types/-/types-1.8.0.tgz#3f5e85b2d6b149337f727ab8a71b8471d8d9a195"
   integrity sha512-Cn+3I0V0vT9ghMuzh1KzZvCkiAxTq+1TR2eSqw5E5AVWfmCtECFkVZBP6uUJZ8YjwLqXheI+rnjqPy7sVM4Fyg==
 
-"@walletconnect/universal-provider@2.7.7":
-  version "2.7.7"
-  resolved "https://registry.yarnpkg.com/@walletconnect/universal-provider/-/universal-provider-2.7.7.tgz#5c9017672b5d1255442533395eda67b19ffb2f2f"
-  integrity sha512-MY+R1sLmIKjFYjanWUM6bOM077+SnShSUfSjCTrsoZE2RDddcSz9EtcATovBSPfzPwUTS20mgcgrkRT4zrFRyQ==
+"@walletconnect/universal-provider@2.8.4":
+  version "2.8.4"
+  resolved "https://registry.yarnpkg.com/@walletconnect/universal-provider/-/universal-provider-2.8.4.tgz#7b62a76a7d99ea41c67374da54aaa4f1b4bc1d03"
+  integrity sha512-JRpOXKIciRMzd03zZxM1WDsYHo/ZS86zZrZ1aCHW1d45ZLP7SbGPRHzZgBY3xrST26yTvWIlRfTUEYn50fzB1g==
   dependencies:
     "@walletconnect/jsonrpc-http-connection" "^1.0.7"
     "@walletconnect/jsonrpc-provider" "1.0.13"
     "@walletconnect/jsonrpc-types" "^1.0.2"
     "@walletconnect/jsonrpc-utils" "^1.0.7"
     "@walletconnect/logger" "^2.0.1"
-    "@walletconnect/sign-client" "2.7.7"
-    "@walletconnect/types" "2.7.7"
-    "@walletconnect/utils" "2.7.7"
-    eip1193-provider "1.0.1"
+    "@walletconnect/sign-client" "2.8.4"
+    "@walletconnect/types" "2.8.4"
+    "@walletconnect/utils" "2.8.4"
     events "^3.3.0"
 
-"@walletconnect/utils@2.7.7":
-  version "2.7.7"
-  resolved "https://registry.yarnpkg.com/@walletconnect/utils/-/utils-2.7.7.tgz#e2d8732f8ac3ffbc1de13e923891b256eb3bbefb"
-  integrity sha512-ozh9gvRAdXkiu+6nOAkoDCokDVPXK/tNATrrYuOhhR+EmGDjlZU2d27HT+HiGREdza0b1HdZN4XneGm0gERV5w==
+"@walletconnect/utils@2.8.4":
+  version "2.8.4"
+  resolved "https://registry.yarnpkg.com/@walletconnect/utils/-/utils-2.8.4.tgz#8dbd3beaef39388be2398145a5f9a061a0317518"
+  integrity sha512-NGw6BINYNeT9JrQrnxldAPheO2ymRrwGrgfExZMyrkb1MShnIX4nzo4KirKInM4LtrY6AA/v0Lu3ooUdfO+xIg==
   dependencies:
     "@stablelib/chacha20poly1305" "1.0.1"
     "@stablelib/hkdf" "1.0.1"
@@ -7666,7 +7691,7 @@
     "@walletconnect/relay-api" "^1.0.9"
     "@walletconnect/safe-json" "^1.0.2"
     "@walletconnect/time" "^1.0.2"
-    "@walletconnect/types" "2.7.7"
+    "@walletconnect/types" "2.8.4"
     "@walletconnect/window-getters" "^1.0.1"
     "@walletconnect/window-metadata" "^1.0.1"
     detect-browser "5.3.0"
@@ -7795,14 +7820,14 @@
     "@ethersproject/providers" "^5"
     "@web3-react/types" "^8.2.0"
 
-"@web3-react/walletconnect-v2@^8.3.1":
-  version "8.3.1"
-  resolved "https://registry.yarnpkg.com/@web3-react/walletconnect-v2/-/walletconnect-v2-8.3.1.tgz#7bedd71d0752d5869475d0e2ee89645b0733eb66"
-  integrity sha512-bsXOTrfj7pYsfxTjLQQvYoh7LsRh3nNYuLSJe3Ay4lGP5dhVr4a7x53arkcSRbxj9dWv15mt3Y/uBqx2t7r35g==
+"@web3-react/walletconnect-v2@^8.3.6":
+  version "8.3.6"
+  resolved "https://registry.yarnpkg.com/@web3-react/walletconnect-v2/-/walletconnect-v2-8.3.6.tgz#8f9e561ba3fa7dd15c56bec7ee1de066857f07b1"
+  integrity sha512-8N01Rns+Ey203D60TAj0iN4LOPsllvdY+8fl8ev+1NaPlgOtF3KrasPrFJ/5ZmVF31jBQYo2kC/X3OITBBnHDA==
   dependencies:
-    "@walletconnect/ethereum-provider" "^2.7.4"
+    "@walletconnect/ethereum-provider" "^2.8.4"
+    "@walletconnect/modal" "^2.4.5"
     "@web3-react/types" "^8.2.0"
-    "@web3modal/standalone" "^2.2.1"
     eventemitter3 "^4.0.7"
 
 "@web3-react/walletconnect@^8.2.0":
@@ -7814,32 +7839,6 @@
     "@web3-react/types" "^8.2.0"
     eventemitter3 "^4.0.7"
 
-"@web3modal/core@2.4.1":
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/@web3modal/core/-/core-2.4.1.tgz#9b0a60aa88ef8518de7a30bab1278b2c9f046012"
-  integrity sha512-v6Y/eQJSI2YfUTv8rGqjFabqdk3ZPjx6Fe7j5Q8fw0ZWF1YRGM3mySG457qtKQ7D7E1kNKA3BHbaOZ3pgQoG6A==
-  dependencies:
-    buffer "6.0.3"
-    valtio "1.10.5"
-
-"@web3modal/standalone@^2.2.1":
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/@web3modal/standalone/-/standalone-2.4.1.tgz#e10330583ce7b550ba676e4c595ac8ea8715bcdb"
-  integrity sha512-ZrI5LwWeT9sd8A3FdIX/gBp3ZrzrX882Ln1vJN0LTCmeP2OUsYcW5bPxjv1PcJ1YUBY7Tg4aTgMUnAVTTuqb+w==
-  dependencies:
-    "@web3modal/core" "2.4.1"
-    "@web3modal/ui" "2.4.1"
-
-"@web3modal/ui@2.4.1":
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/@web3modal/ui/-/ui-2.4.1.tgz#c1c5a8bf4cd749febd15411ec710b22215e66e56"
-  integrity sha512-x1ceyd3mMJsIHs5UUTLvE+6qyCjhyjL6gB/wVmTDbwASHSQIVyshQJ+s7BwIEMP/pbAsYDg+/M8EiUuE+/E/kg==
-  dependencies:
-    "@web3modal/core" "2.4.1"
-    lit "2.7.4"
-    motion "10.15.5"
-    qrcode "1.5.3"
-
 "@webassemblyjs/ast@1.11.1":
   version "1.11.1"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7"
@@ -17346,10 +17345,10 @@ lit-html@^2.7.0:
   dependencies:
     "@types/trusted-types" "^2.0.2"
 
-lit@2.7.4:
-  version "2.7.4"
-  resolved "https://registry.yarnpkg.com/lit/-/lit-2.7.4.tgz#ca63d27fda178dbffae0faf2c882b9910e40842c"
-  integrity sha512-cgD7xrZoYr21mbrkZIuIrj98YTMw/snJPg52deWVV4A8icLyNHI3bF70xsJeAgwTuiq5Kkd+ZR8gybSJDCPB7g==
+lit@2.7.5:
+  version "2.7.5"
+  resolved "https://registry.yarnpkg.com/lit/-/lit-2.7.5.tgz#60bc82990cfad169d42cd786999356dcf79b035f"
+  integrity sha512-i/cH7Ye6nBDUASMnfwcictBnsTN91+aBjXoTHF2xARghXScKxpD4F4WYI+VLXg9lqbMinDfvoI7VnZXjyHgdfQ==
   dependencies:
     "@lit/reactive-element" "^1.6.0"
     lit-element "^3.3.0"
@@ -18206,17 +18205,17 @@ moo@^0.5.1:
   resolved "https://registry.yarnpkg.com/moo/-/moo-0.5.2.tgz#f9fe82473bc7c184b0d32e2215d3f6e67278733c"
   integrity sha512-iSAJLHYKnX41mKcJKjqvnAN9sf0LMDTXDEvFv+ffuRR9a1MIuXLjMNL6EsnDHSkKLTWNqQQ5uo61P4EbU4NU+Q==
 
-motion@10.15.5:
-  version "10.15.5"
-  resolved "https://registry.yarnpkg.com/motion/-/motion-10.15.5.tgz#d336ddbdd37bc28bb99fbb243fe309df6c685ad6"
-  integrity sha512-ejP6KioN4pigTGxL93APzOnvtLklParL59UQB2T3HWXQBxFcIp5/7YXFmkgiA6pNKKzjvnLhnonRBN5iSFMnNw==
+motion@10.16.2:
+  version "10.16.2"
+  resolved "https://registry.yarnpkg.com/motion/-/motion-10.16.2.tgz#7dc173c6ad62210a7e9916caeeaf22c51e598d21"
+  integrity sha512-p+PurYqfUdcJZvtnmAqu5fJgV2kR0uLFQuBKtLeFVTrYEVllI99tiOTSefVNYuip9ELTEkepIIDftNdze76NAQ==
   dependencies:
     "@motionone/animation" "^10.15.1"
-    "@motionone/dom" "^10.15.5"
-    "@motionone/svelte" "^10.15.5"
+    "@motionone/dom" "^10.16.2"
+    "@motionone/svelte" "^10.16.2"
     "@motionone/types" "^10.15.1"
     "@motionone/utils" "^10.15.1"
-    "@motionone/vue" "^10.15.5"
+    "@motionone/vue" "^10.16.2"
 
 mrmime@^1.0.0:
   version "1.0.1"
@@ -24186,10 +24185,10 @@ validator@13.9.0, validator@^13.7.0:
   resolved "https://registry.yarnpkg.com/validator/-/validator-13.9.0.tgz#33e7b85b604f3bbce9bb1a05d5c3e22e1c2ff855"
   integrity sha512-B+dGG8U3fdtM0/aNK4/X8CXq/EcxU2WPrPEkJGslb47qyHsxmbggTWK0yEA4qnYVNF+nxNlN88o14hIcPmSIEA==
 
-valtio@1.10.5:
-  version "1.10.5"
-  resolved "https://registry.yarnpkg.com/valtio/-/valtio-1.10.5.tgz#7852125e3b774b522827d96bd9c76d285c518678"
-  integrity sha512-jTp0k63VXf4r5hPoaC6a6LCG4POkVSh629WLi1+d5PlajLsbynTMd7qAgEiOSPxzoX5iNvbN7iZ/k/g29wrNiQ==
+valtio@1.10.6:
+  version "1.10.6"
+  resolved "https://registry.yarnpkg.com/valtio/-/valtio-1.10.6.tgz#80ed00198b949939863a0fa56ae687abb417fc4f"
+  integrity sha512-SxN1bHUmdhW6V8qsQTpCgJEwp7uHbntuH0S9cdLQtiohuevwBksbpXjwj5uDMA7bLwg1WKyq9sEpZrx3TIMrkA==
   dependencies:
     proxy-compare "2.5.1"
     use-sync-external-store "1.2.0"

From c907c21c5a50aad8732c1ceaa4765d037532ce51 Mon Sep 17 00:00:00 2001
From: Alfetopito <alfetopito@users.noreply.github.com>
Date: Wed, 28 Jun 2023 14:55:47 +0100
Subject: [PATCH 38/67] Revert "ci: deploy on barn/staging automatically after
 creating a release (#2655)"

This reverts commit 3aa51c4437ccc8cbabc5f0554d17311a3320a74e.
---
 .github/workflows/ci.yml             | 13 +++++++++++++
 .github/workflows/release-please.yml | 11 -----------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index db410501bc..4170bc5847 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -159,6 +159,19 @@ jobs:
     with:
       env_name: dev
 
+  vercel-pre-prod:
+    # Deploys to Vercel staging and barn environments
+    name: Vercel pre-prod
+    needs: [test, lint]
+    if: startsWith(github.ref, 'refs/tags/v')
+    uses: ./.github/workflows/vercel.yml
+    secrets: inherit
+    strategy:
+      matrix:
+        env_name: [barn, staging] # deploys both in parallel
+    with:
+      env_name: ${{ matrix.env_name }}
+
   vercel-prod:
     # Deploys to Vercel prod environment
     name: Vercel prod
diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
index db021674c4..e3e63e5e33 100644
--- a/.github/workflows/release-please.yml
+++ b/.github/workflows/release-please.yml
@@ -14,18 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: google-github-actions/release-please-action@v3
-        name: release
         with:
           release-type: node
           package-name: release-please-action
           default-branch: main
-        # Deploys to Vercel staging and barn environments
-      - uses: ./.github/workflows/vercel.yml
-        name: deploy
-        if: ${{ steps.release.outputs.release_created }}
-        secrets: inherit
-        strategy:
-          matrix:
-            env_name: [ barn, staging ] # deploys both in parallel
-        with:
-          env_name: ${{ matrix.env_name }}

From c16d45ad54b3fe39be0de3e1699d19bee79a7fc8 Mon Sep 17 00:00:00 2001
From: Alexandr Kazachenko <shoom3301@gmail.com>
Date: Thu, 29 Jun 2023 00:15:01 -0700
Subject: [PATCH 39/67] feat(twap): update ComposableCoW contract (#2724)

---
 src/abis/ComposableCoW.json                   | 14 +++++++--
 src/modules/advancedOrders/const.ts           | 21 +++++++++----
 src/modules/twap/const.ts                     |  9 +++---
 .../twap/containers/TwapFormWidget/index.tsx  |  6 ++--
 src/modules/twap/hooks/useCreateTwapOrder.ts  |  7 ++---
 .../twap/hooks/useTwapOrderCreationContext.ts |  9 ++++--
 .../createTwapOrderTxs.test.ts.snap           | 20 ++++++++-----
 .../extensibleFallbackSetupTxs.test.tsx.snap  |  4 +--
 .../twap/services/createTwapOrderTxs.test.ts  |  6 +++-
 .../twap/services/createTwapOrderTxs.ts       |  9 ++++--
 .../twap/services/fetchTwapOrdersFromSafe.ts  |  6 ++--
 .../services/verifyExtensibleFallback.test.ts |  2 +-
 src/modules/twap/state/twapOrderAtom.ts       | 11 +++++--
 src/modules/twap/types.ts                     |  2 ++
 .../twap/updaters/TwapOrdersUpdater.tsx       | 30 ++++++++++++-------
 .../twap/utils/parseTwapOrderStruct.ts        |  2 ++
 src/modules/twap/utils/twapOrderToStruct.ts   |  1 +
 17 files changed, 107 insertions(+), 52 deletions(-)

diff --git a/src/abis/ComposableCoW.json b/src/abis/ComposableCoW.json
index 3a82a38845..96f088f3a9 100644
--- a/src/abis/ComposableCoW.json
+++ b/src/abis/ComposableCoW.json
@@ -23,13 +23,23 @@
         "name": "params",
         "type": "tuple"
       },
+      {
+        "internalType": "contract IValueFactory",
+        "name": "factory",
+        "type": "address"
+      },
+      {
+        "internalType": "bytes",
+        "name": "data",
+        "type": "bytes"
+      },
       {
         "internalType": "bool",
         "name": "dispatch",
         "type": "bool"
       }
     ],
-    "name": "create",
+    "name": "createWithContext",
     "outputs": [],
     "stateMutability": "nonpayable",
     "type": "function"
@@ -41,7 +51,7 @@
     ],
     "name": "singleOrders",
     "outputs": [{ "name": "", "type": "bool" }],
-    "stateMutability": "nonpayable",
+    "stateMutability": "view",
     "type": "function"
   },
   {
diff --git a/src/modules/advancedOrders/const.ts b/src/modules/advancedOrders/const.ts
index 83a9d9b7d4..d1d27ee705 100644
--- a/src/modules/advancedOrders/const.ts
+++ b/src/modules/advancedOrders/const.ts
@@ -1,13 +1,22 @@
 import { SupportedChainId } from '@cowprotocol/cow-sdk'
 
+const composableCowAddress = '0xF487887DA5a4b4e3eC114FDAd97dc0F785d72738'
 export const COMPOSABLE_COW_ADDRESS: Record<SupportedChainId, string> = {
-  1: 'TODO',
-  100: 'TODO',
-  5: '0xa31b99bd44528c7bae9e1f675d810ae13b0e29aa',
+  1: composableCowAddress,
+  100: composableCowAddress,
+  5: composableCowAddress,
 }
 
+const extensibleHandlerAddress = '0x4e305935b14627eA57CBDbCfF57e81fd9F240403'
 export const SAFE_EXTENSIBLE_HANDLER_ADDRESS: Record<SupportedChainId, string> = {
-  1: 'TODO',
-  100: 'TODO',
-  5: '0x0f22204afe067e5b0dce38f31f171aed81d0ee24',
+  1: extensibleHandlerAddress,
+  100: extensibleHandlerAddress,
+  5: extensibleHandlerAddress,
+}
+
+const currentBlockFactoryAddress = '0x0899c7DC280363d263Cc954506134F249CceC4a5'
+export const CURRENT_BLOCK_FACTORY_ADDRESS: Record<SupportedChainId, string> = {
+  1: currentBlockFactoryAddress,
+  100: currentBlockFactoryAddress,
+  5: currentBlockFactoryAddress,
 }
diff --git a/src/modules/twap/const.ts b/src/modules/twap/const.ts
index a46ac986cd..539b1cba69 100644
--- a/src/modules/twap/const.ts
+++ b/src/modules/twap/const.ts
@@ -26,12 +26,13 @@ export const orderDeadlines: OrderDeadline[] = [
 ]
 
 export const TWAP_ORDER_STRUCT =
-  'tuple(address sellToken,address buyToken,address receiver,uint256 partSellAmount,uint256 minPartLimit,uint256 t0,uint256 n,uint256 t,uint256 span)'
+  'tuple(address sellToken,address buyToken,address receiver,uint256 partSellAmount,uint256 minPartLimit,uint256 t0,uint256 n,uint256 t,uint256 span,bytes32 appData)'
 
+const twapHandlerAddress = '0x910d00a310f7Dc5B29FE73458F47f519be547D3d'
 export const TWAP_HANDLER_ADDRESS: Record<SupportedChainId, string> = {
-  1: 'TODO',
-  100: 'TODO',
-  5: '0xa12d770028d7072b80baeb6a1df962374fd13d9a',
+  1: twapHandlerAddress,
+  100: twapHandlerAddress,
+  5: twapHandlerAddress,
 }
 
 export const TWAP_PENDING_STATUSES = [TwapOrderStatus.WaitSigning, TwapOrderStatus.Pending, TwapOrderStatus.Scheduled]
diff --git a/src/modules/twap/containers/TwapFormWidget/index.tsx b/src/modules/twap/containers/TwapFormWidget/index.tsx
index 0843b17efb..ffe08a29b9 100644
--- a/src/modules/twap/containers/TwapFormWidget/index.tsx
+++ b/src/modules/twap/containers/TwapFormWidget/index.tsx
@@ -17,10 +17,11 @@ import { useRateInfoParams } from 'common/hooks/useRateInfoParams'
 import * as styledEl from './styled'
 
 import { DEFAULT_TWAP_SLIPPAGE, defaultNumOfParts, orderDeadlines } from '../../const'
+import { useFallbackHandlerVerification } from '../../hooks/useFallbackHandlerVerification'
 import { useTwapFormState } from '../../hooks/useTwapFormState'
 import { AmountParts } from '../../pure/AmountParts'
 import { DeadlineSelector } from '../../pure/DeadlineSelector'
-import { TwapFormState } from '../../pure/PrimaryActionButton/getTwapFormState'
+import { ExtensibleFallbackVerification } from '../../services/verifyExtensibleFallback'
 import { partsStateAtom } from '../../state/partsStateAtom'
 import { twapTimeIntervalAtom } from '../../state/twapOrderAtom'
 import { twapOrdersSettingsAtom, updateTwapOrdersSettingsAtom } from '../../state/twapOrdersSettingsAtom'
@@ -40,6 +41,7 @@ export function TwapFormWidget() {
   const { inputCurrencyAmount, outputCurrencyAmount } = useAdvancedOrdersDerivedState()
   const { inputCurrencyAmount: rawInputCurrencyAmount } = useAdvancedOrdersRawState()
   const { updateState } = useTradeState()
+  const fallbackHandlerVerification = useFallbackHandlerVerification()
 
   const partsState = useAtomValue(partsStateAtom)
   const timeInterval = useAtomValue(twapTimeIntervalAtom)
@@ -59,7 +61,7 @@ export function TwapFormWidget() {
     isCustomDeadline,
   }
 
-  const fallbackHandlerIsNotSet = localFormValidation === TwapFormState.NEED_FALLBACK_HANDLER
+  const fallbackHandlerIsNotSet = fallbackHandlerVerification !== ExtensibleFallbackVerification.HAS_DOMAIN_VERIFIER
   const shouldLoadTwapOrders = !!(isSafeApp && chainId && account && composableCowContract)
 
   // Reset output amount when num of parts or input amount are changed
diff --git a/src/modules/twap/hooks/useCreateTwapOrder.ts b/src/modules/twap/hooks/useCreateTwapOrder.ts
index 75014392e2..05ee71942d 100644
--- a/src/modules/twap/hooks/useCreateTwapOrder.ts
+++ b/src/modules/twap/hooks/useCreateTwapOrder.ts
@@ -4,7 +4,6 @@ import { useCallback } from 'react'
 
 import { CurrencyAmount, Token } from '@uniswap/sdk-core'
 
-import ms from 'ms.macro'
 import { Nullish } from 'types'
 
 import { useAdvancedOrdersDerivedState } from 'modules/advancedOrders'
@@ -76,9 +75,7 @@ export function useCreateTwapOrder() {
         orderClass: 'TWAP',
       }
 
-      const startTime = Math.round((Date.now() + ms`1m`) / 1000) // Now + 1 min
-      const twapOrderWithStartTime = { ...twapOrder, startTime }
-      const paramsStruct = buildTwapOrderParamsStruct(chainId, twapOrderWithStartTime)
+      const paramsStruct = buildTwapOrderParamsStruct(chainId, twapOrder)
       const orderId = getConditionalOrderId(paramsStruct)
 
       tradeFlowAnalytics.placeAdvancedOrder(twapFlowAnalyticsContext)
@@ -88,7 +85,7 @@ export function useCreateTwapOrder() {
         const fallbackSetupTxs = fallbackHandlerIsNotSet
           ? await extensibleFallbackSetupTxs(extensibleFallbackContext)
           : []
-        const createOrderTxs = createTwapOrderTxs(twapOrderWithStartTime, paramsStruct, twapOrderCreationContext)
+        const createOrderTxs = createTwapOrderTxs(twapOrder, paramsStruct, twapOrderCreationContext)
         const { safeTxHash } = await safeAppsSdk.txs.send({ txs: [...fallbackSetupTxs, ...createOrderTxs] })
 
         addTwapOrderToList({
diff --git a/src/modules/twap/hooks/useTwapOrderCreationContext.ts b/src/modules/twap/hooks/useTwapOrderCreationContext.ts
index 02a300adf0..e34a9e1209 100644
--- a/src/modules/twap/hooks/useTwapOrderCreationContext.ts
+++ b/src/modules/twap/hooks/useTwapOrderCreationContext.ts
@@ -5,7 +5,9 @@ import { Nullish } from 'types'
 import { Erc20 } from 'legacy/abis/types'
 import { useTokenContract } from 'legacy/hooks/useContract'
 
+import { CURRENT_BLOCK_FACTORY_ADDRESS } from 'modules/advancedOrders'
 import { useComposableCowContract } from 'modules/advancedOrders/hooks/useComposableCowContract'
+import { useWalletInfo } from 'modules/wallet'
 
 import { ComposableCoW } from 'abis/types'
 import { useNeedsApproval } from 'common/hooks/useNeedsApproval'
@@ -15,18 +17,21 @@ export interface TwapOrderCreationContext {
   composableCowContract: ComposableCoW
   needsApproval: boolean
   spender: string
+  currentBlockFactoryAddress: string
   erc20Contract: Erc20
 }
 
 export function useTwapOrderCreationContext(
   inputAmount: Nullish<CurrencyAmount<Token>>
 ): TwapOrderCreationContext | null {
+  const { chainId } = useWalletInfo()
   const composableCowContract = useComposableCowContract()
   const needsApproval = useNeedsApproval(inputAmount)
   const erc20Contract = useTokenContract(inputAmount?.currency.address)
   const spender = useTradeSpenderAddress()
+  const currentBlockFactoryAddress = chainId ? CURRENT_BLOCK_FACTORY_ADDRESS[chainId] : null
 
-  if (!composableCowContract || !erc20Contract || !spender) return null
+  if (!composableCowContract || !erc20Contract || !spender || !currentBlockFactoryAddress) return null
 
-  return { composableCowContract, erc20Contract, needsApproval, spender }
+  return { composableCowContract, erc20Contract, needsApproval, spender, currentBlockFactoryAddress }
 }
diff --git a/src/modules/twap/services/__snapshots__/createTwapOrderTxs.test.ts.snap b/src/modules/twap/services/__snapshots__/createTwapOrderTxs.test.ts.snap
index e28003542c..0c3f4c6070 100644
--- a/src/modules/twap/services/__snapshots__/createTwapOrderTxs.test.ts.snap
+++ b/src/modules/twap/services/__snapshots__/createTwapOrderTxs.test.ts.snap
@@ -2,13 +2,15 @@
 
 exports[`Create TWAP order When sell token is NOT approved, then should generate approval and creation transactions 1`] = `
 Array [
-  "create",
+  "createWithContext",
   Array [
     Object {
-      "handler": "0xa12d770028d7072b80baeb6a1df962374fd13d9a",
+      "handler": "0x910d00a310f7Dc5B29FE73458F47f519be547D3d",
       "salt": "0x00000000000000000000000000000000000000000000000000000015c90b9b2a",
-      "staticInput": "0x00000000000000000000000091056d4a53e1faa1a84306d4deaec71085394bc8000000000000000000000000b4fbf271143f4fbf7b91a5ded31805e42b2208d6000000000000000000000000b4fbf271143f4fbf7b91a5ded31805e42b2208d600000000000000000000000000000000000000000000000000000007c2d24d55000000000000000000000000000000000000000000000000000000000001046a00000000000000000000000000000000000000000000000000000000646b782c000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000002580000000000000000000000000000000000000000000000000000000000000000",
+      "staticInput": "0x00000000000000000000000091056d4a53e1faa1a84306d4deaec71085394bc8000000000000000000000000b4fbf271143f4fbf7b91a5ded31805e42b2208d6000000000000000000000000b4fbf271143f4fbf7b91a5ded31805e42b2208d600000000000000000000000000000000000000000000000000000007c2d24d55000000000000000000000000000000000000000000000000000000000001046a00000000000000000000000000000000000000000000000000000000646b782c0000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000025800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
     },
+    "0x0899c7DC280363d263Cc954506134F249CceC4a5",
+    "0x",
     true,
   ],
 ]
@@ -35,7 +37,7 @@ Array [
   Object {
     "data": "0xCREATE_COW_TX_DATA",
     "operation": 0,
-    "to": "0xa31b99bd44528c7bae9e1f675d810ae13b0e29aa",
+    "to": "0xF487887DA5a4b4e3eC114FDAd97dc0F785d72738",
     "value": "0",
   },
 ]
@@ -43,13 +45,15 @@ Array [
 
 exports[`Create TWAP order When sell token is approved, then should generate only creation transaction 1`] = `
 Array [
-  "create",
+  "createWithContext",
   Array [
     Object {
-      "handler": "0xa12d770028d7072b80baeb6a1df962374fd13d9a",
+      "handler": "0x910d00a310f7Dc5B29FE73458F47f519be547D3d",
       "salt": "0x00000000000000000000000000000000000000000000000000000015c90b9b2a",
-      "staticInput": "0x00000000000000000000000091056d4a53e1faa1a84306d4deaec71085394bc8000000000000000000000000b4fbf271143f4fbf7b91a5ded31805e42b2208d6000000000000000000000000b4fbf271143f4fbf7b91a5ded31805e42b2208d600000000000000000000000000000000000000000000000000000007c2d24d55000000000000000000000000000000000000000000000000000000000001046a00000000000000000000000000000000000000000000000000000000646b782c000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000002580000000000000000000000000000000000000000000000000000000000000000",
+      "staticInput": "0x00000000000000000000000091056d4a53e1faa1a84306d4deaec71085394bc8000000000000000000000000b4fbf271143f4fbf7b91a5ded31805e42b2208d6000000000000000000000000b4fbf271143f4fbf7b91a5ded31805e42b2208d600000000000000000000000000000000000000000000000000000007c2d24d55000000000000000000000000000000000000000000000000000000000001046a00000000000000000000000000000000000000000000000000000000646b782c0000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000025800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
     },
+    "0x0899c7DC280363d263Cc954506134F249CceC4a5",
+    "0x",
     true,
   ],
 ]
@@ -60,7 +64,7 @@ Array [
   Object {
     "data": "0xCREATE_COW_TX_DATA",
     "operation": 0,
-    "to": "0xa31b99bd44528c7bae9e1f675d810ae13b0e29aa",
+    "to": "0xF487887DA5a4b4e3eC114FDAd97dc0F785d72738",
     "value": "0",
   },
 ]
diff --git a/src/modules/twap/services/__snapshots__/extensibleFallbackSetupTxs.test.tsx.snap b/src/modules/twap/services/__snapshots__/extensibleFallbackSetupTxs.test.tsx.snap
index 60bcb3d1f3..491d453a90 100644
--- a/src/modules/twap/services/__snapshots__/extensibleFallbackSetupTxs.test.tsx.snap
+++ b/src/modules/twap/services/__snapshots__/extensibleFallbackSetupTxs.test.tsx.snap
@@ -3,13 +3,13 @@
 exports[`extensibleFallbackSetupTxs - service to generate transactions for ExtensibleFallback setup Should create a bundle of two transactions: setFallbackHandler and setDomainVerifier 1`] = `
 Array [
   Object {
-    "data": "0xf08a03230000000000000000000000000f22204afe067e5b0dce38f31f171aed81d0ee24",
+    "data": "0xf08a03230000000000000000000000004e305935b14627ea57cbdbcff57e81fd9f240403",
     "operation": 0,
     "to": "0xA12D770028d7072b80BAEb6A1df962cccfd1dddd",
     "value": "0",
   },
   Object {
-    "data": "0x3365582ca5b986c2f5845d520bcb903639360b147735589732066cea24a3a59678025c94000000000000000000000000a31b99bd44528c7bae9e1f675d810ae13b0e29aa",
+    "data": "0x3365582ca5b986c2f5845d520bcb903639360b147735589732066cea24a3a59678025c94000000000000000000000000f487887da5a4b4e3ec114fdad97dc0f785d72738",
     "operation": 0,
     "to": "0xA12D770028d7072b80BAEb6A1df962cccfd1dddd",
     "value": "0",
diff --git a/src/modules/twap/services/createTwapOrderTxs.test.ts b/src/modules/twap/services/createTwapOrderTxs.test.ts
index e80fb829eb..908e0a8592 100644
--- a/src/modules/twap/services/createTwapOrderTxs.test.ts
+++ b/src/modules/twap/services/createTwapOrderTxs.test.ts
@@ -4,9 +4,11 @@ import { CurrencyAmount } from '@uniswap/sdk-core'
 import { COW } from 'legacy/constants/tokens'
 import { WETH_GOERLI } from 'legacy/utils/goerli/constants'
 
+import { COMPOSABLE_COW_ADDRESS, CURRENT_BLOCK_FACTORY_ADDRESS } from 'modules/advancedOrders'
+import { getAppDataHash } from 'modules/appData'
+
 import { createTwapOrderTxs } from './createTwapOrderTxs'
 
-import { COMPOSABLE_COW_ADDRESS } from '../../advancedOrders'
 import { TwapOrderCreationContext } from '../hooks/useTwapOrderCreationContext'
 import { TWAPOrder } from '../types'
 import { buildTwapOrderParamsStruct } from '../utils/buildTwapOrderParamsStruct'
@@ -21,6 +23,7 @@ const order: TWAPOrder = {
   startTime: 1684764716,
   timeInterval: 600,
   span: 0,
+  appData: getAppDataHash(),
 }
 
 const CREATE_COW_TX_DATA = '0xCREATE_COW_TX_DATA'
@@ -44,6 +47,7 @@ describe('Create TWAP order', () => {
       } as any,
       needsApproval: false,
       spender: '0xB4FBF271143F4FBf7B91A5ded31805e42b222222',
+      currentBlockFactoryAddress: CURRENT_BLOCK_FACTORY_ADDRESS[chainId],
       erc20Contract: { interface: { encodeFunctionData: approveFn } } as any,
     }
   })
diff --git a/src/modules/twap/services/createTwapOrderTxs.ts b/src/modules/twap/services/createTwapOrderTxs.ts
index d734f6de52..48032553b4 100644
--- a/src/modules/twap/services/createTwapOrderTxs.ts
+++ b/src/modules/twap/services/createTwapOrderTxs.ts
@@ -8,14 +8,19 @@ export function createTwapOrderTxs(
   paramsStruct: ConditionalOrderParams,
   context: TwapOrderCreationContext
 ): MetaTransactionData[] {
-  const { composableCowContract, needsApproval, erc20Contract, spender } = context
+  const { composableCowContract, needsApproval, erc20Contract, spender, currentBlockFactoryAddress } = context
 
   const sellTokenAddress = order.sellAmount.currency.address
   const sellAmountAtoms = order.sellAmount.quotient.toString()
 
   const createOrderTx = {
     to: composableCowContract.address,
-    data: composableCowContract.interface.encodeFunctionData('create', [paramsStruct, true]),
+    data: composableCowContract.interface.encodeFunctionData('createWithContext', [
+      paramsStruct,
+      currentBlockFactoryAddress,
+      '0x',
+      true,
+    ]),
     value: '0',
     operation: 0,
   }
diff --git a/src/modules/twap/services/fetchTwapOrdersFromSafe.ts b/src/modules/twap/services/fetchTwapOrdersFromSafe.ts
index 59b43a419e..bd1dc314e6 100644
--- a/src/modules/twap/services/fetchTwapOrdersFromSafe.ts
+++ b/src/modules/twap/services/fetchTwapOrdersFromSafe.ts
@@ -7,8 +7,8 @@ import { ComposableCoW } from 'abis/types'
 
 import { ConditionalOrderParams, TwapOrdersSafeData } from '../types'
 
-// ComposableCoW.create method
-const CREATE_COMPOSABLE_ORDER_SELECTOR = '6bfae1ca'
+// ComposableCoW.createWithContext method
+const CREATE_COMPOSABLE_ORDER_SELECTOR = '0d0d9800'
 
 export async function fetchTwapOrdersFromSafe(
   safeAddress: string,
@@ -61,7 +61,7 @@ function parseConditionalOrderParams(
   callData: string
 ): ConditionalOrderParams | null {
   try {
-    const _result = composableCowContract.interface.decodeFunctionData('create', callData)
+    const _result = composableCowContract.interface.decodeFunctionData('createWithContext', callData)
     const { params } = _result as any as { params: ConditionalOrderParams }
 
     return { handler: params.handler, salt: params.salt, staticInput: params.staticInput }
diff --git a/src/modules/twap/services/verifyExtensibleFallback.test.ts b/src/modules/twap/services/verifyExtensibleFallback.test.ts
index 7e778389d0..7b7d93d0f7 100644
--- a/src/modules/twap/services/verifyExtensibleFallback.test.ts
+++ b/src/modules/twap/services/verifyExtensibleFallback.test.ts
@@ -28,7 +28,7 @@ describe('verifyExtensibleFallback', () => {
           // domainVerifiers()
           if (method === 'eth_call' && params?.[0]?.data?.startsWith('0x51cad5ee')) {
             //Composable cow address
-            return Promise.resolve('0x000000000000000000000000a31b99bd44528c7bae9e1f675d810ae13b0e29aa')
+            return Promise.resolve('0x000000000000000000000000F487887DA5a4b4e3eC114FDAd97dc0F785d72738')
           }
 
           return defaultJsonRpcHandler(method)
diff --git a/src/modules/twap/state/twapOrderAtom.ts b/src/modules/twap/state/twapOrderAtom.ts
index fa72d1e52b..3727144f48 100644
--- a/src/modules/twap/state/twapOrderAtom.ts
+++ b/src/modules/twap/state/twapOrderAtom.ts
@@ -2,10 +2,13 @@ import { atom } from 'jotai'
 
 import { CurrencyAmount, Token } from '@uniswap/sdk-core'
 
+import { advancedOrdersDerivedStateAtom } from 'modules/advancedOrders'
+import { getAppDataHash } from 'modules/appData'
+import { appDataInfoAtom } from 'modules/appData/state/atoms'
+import { walletInfoAtom } from 'modules/wallet/api/state'
+
 import { twapOrderSlippage, twapOrdersSettingsAtom } from './twapOrdersSettingsAtom'
 
-import { advancedOrdersDerivedStateAtom } from '../../advancedOrders'
-import { walletInfoAtom } from '../../wallet/api/state'
 import { TWAPOrder } from '../types'
 import { customDeadlineToSeconds } from '../utils/deadlinePartsDisplay'
 
@@ -17,6 +20,7 @@ export const twapTimeIntervalAtom = atom<number>((get) => {
 })
 
 export const twapOrderAtom = atom<TWAPOrder | null>((get) => {
+  const appDataInfo = get(appDataInfoAtom)
   const { account } = get(walletInfoAtom)
   const { numberOfPartsValue } = get(twapOrdersSettingsAtom)
   const timeInterval = get(twapTimeIntervalAtom)
@@ -33,8 +37,9 @@ export const twapOrderAtom = atom<TWAPOrder | null>((get) => {
     buyAmount: buyAmountWithSlippage as CurrencyAmount<Token>,
     receiver: recipient || account, // TODO: check case with ENS name
     numOfParts: numberOfPartsValue,
-    startTime: 0, // Will be set just before an order creation
+    startTime: 0, // Will be set to a block timestamp value from CurrentBlockTimestampFactory
     timeInterval,
     span: 0,
+    appData: appDataInfo?.hash || getAppDataHash(),
   }
 })
diff --git a/src/modules/twap/types.ts b/src/modules/twap/types.ts
index ad84b4c64c..34da982527 100644
--- a/src/modules/twap/types.ts
+++ b/src/modules/twap/types.ts
@@ -12,6 +12,7 @@ export interface TWAPOrder {
   startTime: number
   timeInterval: number
   span: number
+  appData: string
 }
 
 export interface TWAPOrderStruct {
@@ -27,6 +28,7 @@ export interface TWAPOrderStruct {
   // timeInterval
   t: number
   span: number
+  appData: string
 }
 
 export enum TwapOrderStatus {
diff --git a/src/modules/twap/updaters/TwapOrdersUpdater.tsx b/src/modules/twap/updaters/TwapOrdersUpdater.tsx
index 3f811804f1..83deead433 100644
--- a/src/modules/twap/updaters/TwapOrdersUpdater.tsx
+++ b/src/modules/twap/updaters/TwapOrdersUpdater.tsx
@@ -3,6 +3,8 @@ import { useEffect, useMemo } from 'react'
 
 import { SupportedChainId } from '@cowprotocol/cow-sdk'
 
+import { isTruthy } from 'legacy/utils/misc'
+
 import { ComposableCoW } from 'abis/types'
 
 import { TWAP_PENDING_STATUSES } from '../const'
@@ -32,17 +34,23 @@ export function TwapOrdersUpdater(props: {
   const ordersSafeData = useFetchTwapOrdersFromSafe(props)
 
   const allOrdersInfo: TwapOrderInfo[] = useMemo(() => {
-    return ordersSafeData.map((data) => {
-      const id = getConditionalOrderId(data.conditionalOrderParams)
-      const order = parseTwapOrderStruct(data.conditionalOrderParams.staticInput)
-
-      return {
-        id,
-        orderStruct: order,
-        safeData: data,
-        isExpired: isTwapOrderExpired(order),
-      }
-    })
+    return ordersSafeData
+      .map((data) => {
+        try {
+          const id = getConditionalOrderId(data.conditionalOrderParams)
+          const order = parseTwapOrderStruct(data.conditionalOrderParams.staticInput)
+
+          return {
+            id,
+            orderStruct: order,
+            safeData: data,
+            isExpired: isTwapOrderExpired(order),
+          }
+        } catch (e) {
+          return null
+        }
+      })
+      .filter(isTruthy)
   }, [ordersSafeData])
 
   // Here we can split all orders in two groups: 1. Not signed + expired, 2. Open + cancelled
diff --git a/src/modules/twap/utils/parseTwapOrderStruct.ts b/src/modules/twap/utils/parseTwapOrderStruct.ts
index 5f4685258f..b14ea9ff17 100644
--- a/src/modules/twap/utils/parseTwapOrderStruct.ts
+++ b/src/modules/twap/utils/parseTwapOrderStruct.ts
@@ -13,6 +13,7 @@ const TWAP_STRUCT_ABI = [
   { name: 'n', type: 'uint256' },
   { name: 't', type: 'uint256' },
   { name: 'span', type: 'uint256' },
+  { name: 'appData', type: 'bytes32' },
 ] as ParamType[]
 
 export function parseTwapOrderStruct(staticInput: string): TWAPOrderStruct {
@@ -28,5 +29,6 @@ export function parseTwapOrderStruct(staticInput: string): TWAPOrderStruct {
     n: (rawData['n'] as BigNumber).toNumber(),
     t: (rawData['t'] as BigNumber).toNumber(),
     span: (rawData['span'] as BigNumber).toNumber(),
+    appData: rawData['appData'],
   }
 }
diff --git a/src/modules/twap/utils/twapOrderToStruct.ts b/src/modules/twap/utils/twapOrderToStruct.ts
index 10f0b2482b..3b02aa0503 100644
--- a/src/modules/twap/utils/twapOrderToStruct.ts
+++ b/src/modules/twap/utils/twapOrderToStruct.ts
@@ -11,5 +11,6 @@ export function twapOrderToStruct(order: TWAPOrder): TWAPOrderStruct {
     n: order.numOfParts,
     t: order.timeInterval,
     span: order.span,
+    appData: order.appData,
   }
 }

From 098cc1019e67c7370f2d2423700748d2c20ce442 Mon Sep 17 00:00:00 2001
From: Anxo Rodriguez <anxolin@gmail.com>
Date: Thu, 29 Jun 2023 17:27:00 +0100
Subject: [PATCH 40/67] feat: create library for widget-react (#2716)

* feat: create library for widget-react

* fix: fix wrong routes

* chore: fix build

---------

Co-authored-by: shoom3301 <shoom3301@gmail.com>
---
 craco.config.js                               |  2 +
 src/common/constants/routes.ts                |  1 +
 src/libs/widget-lib/README.md                 |  6 +-
 src/libs/widget-react/.eslintrc.json          | 20 +++++++
 src/libs/widget-react/README.md               | 59 +++++++++++++++++++
 src/libs/widget-react/jest.config.ts          | 11 ++++
 src/libs/widget-react/package.json            | 12 ++++
 src/libs/widget-react/project.json            | 50 ++++++++++++++++
 src/libs/widget-react/src/index.ts            |  1 +
 .../src/lib/CowSwapWidget.spec.tsx            | 10 ++++
 .../widget-react/src/lib/CowSwapWidget.tsx    | 33 +++++++++++
 src/libs/widget-react/tsconfig.json           | 21 +++++++
 src/libs/widget-react/tsconfig.lib.json       | 23 ++++++++
 src/libs/widget-react/tsconfig.spec.json      | 20 +++++++
 src/libs/widget-react/vite.config.ts          | 49 +++++++++++++++
 .../application/containers/App/RoutesApp.tsx  |  4 ++
 src/pages/KitchenSink/index.tsx               | 22 +++++++
 tsconfig.base.json                            |  3 +-
 18 files changed, 341 insertions(+), 6 deletions(-)
 create mode 100644 src/libs/widget-react/.eslintrc.json
 create mode 100644 src/libs/widget-react/README.md
 create mode 100644 src/libs/widget-react/jest.config.ts
 create mode 100644 src/libs/widget-react/package.json
 create mode 100644 src/libs/widget-react/project.json
 create mode 100644 src/libs/widget-react/src/index.ts
 create mode 100644 src/libs/widget-react/src/lib/CowSwapWidget.spec.tsx
 create mode 100644 src/libs/widget-react/src/lib/CowSwapWidget.tsx
 create mode 100644 src/libs/widget-react/tsconfig.json
 create mode 100644 src/libs/widget-react/tsconfig.lib.json
 create mode 100644 src/libs/widget-react/tsconfig.spec.json
 create mode 100644 src/libs/widget-react/vite.config.ts

diff --git a/craco.config.js b/craco.config.js
index 1f6848c4c4..bf02ad9e6f 100644
--- a/craco.config.js
+++ b/craco.config.js
@@ -62,6 +62,8 @@ module.exports = {
       'bn.js': path.resolve(__dirname, 'node_modules/bn.js/lib/bn.js'),
       '@cowprotocol/ui': path.resolve(__dirname, 'src/libs/ui/src/index.ts'),
       '@cowprotocol/ui-utils': path.resolve(__dirname, 'src/libs/ui-utils/src/index.ts'),
+      '@cowprotocol/widget-lib': path.resolve(__dirname, 'src/libs/widget-lib/src/index.ts'),
+      '@cowprotocol/widget-react': path.resolve(__dirname, 'src/libs/widget-react/src/index.ts'),
     },
     // https://webpack.js.org/configuration
     configure: (webpackConfig) => ({
diff --git a/src/common/constants/routes.ts b/src/common/constants/routes.ts
index 0054846fa3..99d16e661c 100644
--- a/src/common/constants/routes.ts
+++ b/src/common/constants/routes.ts
@@ -29,6 +29,7 @@ export const Routes = {
   DOCS: '/docs',
   STATS: '/stats',
   TWITTER: '/twitter',
+  KITCHEN_SINK: '/kitchen-sink',
 } as const
 
 export type RoutesKeys = keyof typeof Routes
diff --git a/src/libs/widget-lib/README.md b/src/libs/widget-lib/README.md
index 46b1e77b69..eadb59aee9 100644
--- a/src/libs/widget-lib/README.md
+++ b/src/libs/widget-lib/README.md
@@ -1,4 +1,4 @@
-# CoW Swap widget-lib
+# CoW Swap Widget Library
 
 ## Use it
 
@@ -60,7 +60,3 @@ nx build widget-lib
 # Publish to NPM
 nx publish widget-lib --ver 0.0.7 --tag latest
 ```
-
-## Running unit tests
-
-Run `nx test widget-lib` to execute the unit tests via [Jest](https://jestjs.io).
diff --git a/src/libs/widget-react/.eslintrc.json b/src/libs/widget-react/.eslintrc.json
new file mode 100644
index 0000000000..79e6174ec7
--- /dev/null
+++ b/src/libs/widget-react/.eslintrc.json
@@ -0,0 +1,20 @@
+{
+  // TODO: Once we get rid of craco, cra
+  // "extends": ["plugin:@nx/react", "../../../.eslintrc.json"],
+  "extends": ["../../../.eslintrc.json"],
+  "ignorePatterns": ["!**/*"],
+  "overrides": [
+    {
+      "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
+      "rules": {}
+    },
+    {
+      "files": ["*.ts", "*.tsx"],
+      "rules": {}
+    },
+    {
+      "files": ["*.js", "*.jsx"],
+      "rules": {}
+    }
+  ]
+}
diff --git a/src/libs/widget-react/README.md b/src/libs/widget-react/README.md
new file mode 100644
index 0000000000..637a2031d7
--- /dev/null
+++ b/src/libs/widget-react/README.md
@@ -0,0 +1,59 @@
+# CoW Swap React widget
+
+React component that creates a CoW Swap widget. It is based on [https://npmjs.com/package/@cowprotocol/widget-lib])https://npmjs.com/package/@cowprotocol/widget-lib)
+
+## Use it
+
+Install dependency
+
+```bash
+# Install the dependency using NPM
+npm install @cowprotocol/widget-react --save
+
+# ...or alternativelly use YARN
+yarn add @cowprotocol/widget-react
+```
+
+Import component and some convenient types
+
+```ts
+import { CowSwapWidgetSettings } from '@cowprotocol/widget-lib'
+import { CowSwapWidget, CowSwapWidgetParams } from '@cowprotocol/widget-react'
+```
+
+Prepare the config for the widget:
+
+```ts
+const cowSwapWidgetParams: CowSwapWidgetParams = {
+  width: 600,
+  height: 700,
+}
+
+const cowSwapWidgetSettings: CowSwapWidgetSettings = {
+  urlParams: {
+    chainId: 1,
+    tradeType: 'swap',
+    env: 'local',
+  },
+  appParams: {},
+}
+```
+
+Render the component:
+
+```jsx
+<CowSwapWidget params={cowSwapWidgetParams} settings={cowSwapWidgetSettings} />
+```
+
+## Developers
+
+```bash
+# Test
+nx test widget-react
+
+# Build the library
+nx build widget-react
+
+# Publish to NPM
+nx publish widget-react --ver x.y.z --tag latest
+```
diff --git a/src/libs/widget-react/jest.config.ts b/src/libs/widget-react/jest.config.ts
new file mode 100644
index 0000000000..c30b5a39bb
--- /dev/null
+++ b/src/libs/widget-react/jest.config.ts
@@ -0,0 +1,11 @@
+/* eslint-disable */
+export default {
+  displayName: 'widget-react',
+  preset: '../../../jest.preset.js',
+  transform: {
+    '^(?!.*\\.(js|jsx|ts|tsx|css|json)$)': '@nx/react/plugins/jest',
+    '^.+\\.[tj]sx?$': ['babel-jest', { presets: ['@nx/react/babel'] }],
+  },
+  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
+  coverageDirectory: '../../../coverage/src/libs/widget-react',
+}
diff --git a/src/libs/widget-react/package.json b/src/libs/widget-react/package.json
new file mode 100644
index 0000000000..89c2f2b5fe
--- /dev/null
+++ b/src/libs/widget-react/package.json
@@ -0,0 +1,12 @@
+{
+  "name": "@cowprotocol/widget-react",
+  "version": "0.0.1",
+  "main": "./index.js",
+  "types": "./index.d.ts",
+  "exports": {
+    ".": {
+      "import": "./index.mjs",
+      "require": "./index.js"
+    }
+  }
+}
diff --git a/src/libs/widget-react/project.json b/src/libs/widget-react/project.json
new file mode 100644
index 0000000000..73e92d0995
--- /dev/null
+++ b/src/libs/widget-react/project.json
@@ -0,0 +1,50 @@
+{
+  "name": "widget-react",
+  "$schema": "../../../node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "src/libs/widget-react/src",
+  "projectType": "library",
+  "tags": [],
+  "targets": {
+    "lint": {
+      "executor": "@nx/linter:eslint",
+      "outputs": ["{options.outputFile}"],
+      "options": {
+        "lintFilePatterns": ["src/libs/widget-react/**/*.{ts,tsx,js,jsx}"]
+      }
+    },
+    "build": {
+      "executor": "@nx/vite:build",
+      "outputs": ["{options.outputPath}"],
+      "defaultConfiguration": "production",
+      "options": {
+        "outputPath": "dist/libs/widget-react"
+      },
+      "configurations": {
+        "development": {
+          "mode": "development"
+        },
+        "production": {
+          "mode": "production"
+        }
+      }
+    },
+    "publish": {
+      "command": "node tools/scripts/publish.mjs widget-react {args.ver} {args.tag}",
+      "dependsOn": ["build"]
+    },
+    "test": {
+      "executor": "@nx/jest:jest",
+      "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
+      "options": {
+        "jestConfig": "src/libs/widget-react/jest.config.ts",
+        "passWithNoTests": true
+      },
+      "configurations": {
+        "ci": {
+          "ci": true,
+          "codeCoverage": true
+        }
+      }
+    }
+  }
+}
diff --git a/src/libs/widget-react/src/index.ts b/src/libs/widget-react/src/index.ts
new file mode 100644
index 0000000000..14fa5b6d4a
--- /dev/null
+++ b/src/libs/widget-react/src/index.ts
@@ -0,0 +1 @@
+export * from './lib/CowSwapWidget'
diff --git a/src/libs/widget-react/src/lib/CowSwapWidget.spec.tsx b/src/libs/widget-react/src/lib/CowSwapWidget.spec.tsx
new file mode 100644
index 0000000000..becdda9a70
--- /dev/null
+++ b/src/libs/widget-react/src/lib/CowSwapWidget.spec.tsx
@@ -0,0 +1,10 @@
+import { render } from '@testing-library/react'
+
+// import { CowSwapWidget } from './CowSwapWidget'
+
+describe('CowSwapWidget', () => {
+  it('should render successfully', () => {
+    // const { baseElement } = render(<CowSwapWidget params={{}} settings={{}} />)
+    // expect(baseElement).toBeTruthy()
+  })
+})
diff --git a/src/libs/widget-react/src/lib/CowSwapWidget.tsx b/src/libs/widget-react/src/lib/CowSwapWidget.tsx
new file mode 100644
index 0000000000..d95f8609f6
--- /dev/null
+++ b/src/libs/widget-react/src/lib/CowSwapWidget.tsx
@@ -0,0 +1,33 @@
+import { useEffect, useRef } from 'react'
+
+import {
+  cowSwapWidget,
+  CowSwapWidgetParams as CowSwapWidgetParamsAux,
+  CowSwapWidgetSettings,
+} from '@cowprotocol/widget-lib'
+
+export type CowSwapWidgetParams = Omit<CowSwapWidgetParamsAux, 'container'>
+export interface CowSwapWidgetProps {
+  params: CowSwapWidgetParams
+  settings: CowSwapWidgetSettings
+}
+
+export function CowSwapWidget(props: CowSwapWidgetProps) {
+  const cowWidgetRef = useRef(null)
+
+  useEffect(() => {
+    if (cowWidgetRef.current) {
+      const { params, settings } = props
+
+      cowSwapWidget(
+        {
+          ...params,
+          container: cowWidgetRef.current,
+        },
+        settings
+      )
+    }
+  }, [cowWidgetRef, props])
+
+  return <div ref={cowWidgetRef}></div>
+}
diff --git a/src/libs/widget-react/tsconfig.json b/src/libs/widget-react/tsconfig.json
new file mode 100644
index 0000000000..acc38d499c
--- /dev/null
+++ b/src/libs/widget-react/tsconfig.json
@@ -0,0 +1,21 @@
+{
+  "compilerOptions": {
+    "jsx": "react-jsx",
+    "allowJs": false,
+    "esModuleInterop": false,
+    "allowSyntheticDefaultImports": true,
+    "strict": true,
+    "types": ["vite/client"]
+  },
+  "files": [],
+  "include": [],
+  "references": [
+    {
+      "path": "./tsconfig.lib.json"
+    },
+    {
+      "path": "./tsconfig.spec.json"
+    }
+  ],
+  "extends": "../../../tsconfig.base.json"
+}
diff --git a/src/libs/widget-react/tsconfig.lib.json b/src/libs/widget-react/tsconfig.lib.json
new file mode 100644
index 0000000000..34489e9d3f
--- /dev/null
+++ b/src/libs/widget-react/tsconfig.lib.json
@@ -0,0 +1,23 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../../dist/out-tsc",
+    "types": ["node", "vite/client"]
+  },
+  "files": [
+    "../../../node_modules/@nx/react/typings/styled-jsx.d.ts",
+    "../../../node_modules/@nx/react/typings/cssmodule.d.ts",
+    "../../../node_modules/@nx/react/typings/image.d.ts"
+  ],
+  "exclude": [
+    "**/*.spec.ts",
+    "**/*.test.ts",
+    "**/*.spec.tsx",
+    "**/*.test.tsx",
+    "**/*.spec.js",
+    "**/*.test.js",
+    "**/*.spec.jsx",
+    "**/*.test.jsx"
+  ],
+  "include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"]
+}
diff --git a/src/libs/widget-react/tsconfig.spec.json b/src/libs/widget-react/tsconfig.spec.json
new file mode 100644
index 0000000000..25b7af8f6d
--- /dev/null
+++ b/src/libs/widget-react/tsconfig.spec.json
@@ -0,0 +1,20 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../../dist/out-tsc",
+    "module": "commonjs",
+    "types": ["jest", "node"]
+  },
+  "include": [
+    "jest.config.ts",
+    "src/**/*.test.ts",
+    "src/**/*.spec.ts",
+    "src/**/*.test.tsx",
+    "src/**/*.spec.tsx",
+    "src/**/*.test.js",
+    "src/**/*.spec.js",
+    "src/**/*.test.jsx",
+    "src/**/*.spec.jsx",
+    "src/**/*.d.ts"
+  ]
+}
diff --git a/src/libs/widget-react/vite.config.ts b/src/libs/widget-react/vite.config.ts
new file mode 100644
index 0000000000..15a351e00e
--- /dev/null
+++ b/src/libs/widget-react/vite.config.ts
@@ -0,0 +1,49 @@
+/// <reference types="vitest" />
+import { defineConfig } from 'vite'
+import react from '@vitejs/plugin-react'
+import viteTsConfigPaths from 'vite-tsconfig-paths'
+import dts from 'vite-plugin-dts'
+import { joinPathFragments } from '@nx/devkit'
+
+export default defineConfig({
+  cacheDir: '../../../node_modules/.vite/widget-react',
+
+  plugins: [
+    dts({
+      entryRoot: 'src',
+      tsConfigFilePath: joinPathFragments(__dirname, 'tsconfig.lib.json'),
+      skipDiagnostics: true,
+    }),
+    react(),
+    viteTsConfigPaths({
+      root: '../../../',
+    }),
+  ],
+
+  // Uncomment this if you are using workers.
+  // worker: {
+  //  plugins: [
+  //    viteTsConfigPaths({
+  //      root: '../../../',
+  //    }),
+  //  ],
+  // },
+
+  // Configuration for building your library.
+  // See: https://vitejs.dev/guide/build.html#library-mode
+  build: {
+    lib: {
+      // Could also be a dictionary or array of multiple entry points.
+      entry: 'src/index.ts',
+      name: 'widget-react',
+      fileName: 'index',
+      // Change this to the formats you want to support.
+      // Don't forgot to update your package.json as well.
+      formats: ['es', 'cjs'],
+    },
+    rollupOptions: {
+      // External packages that should not be bundled into your library.
+      external: ['react', 'react-dom', 'react/jsx-runtime'],
+    },
+  },
+})
diff --git a/src/modules/application/containers/App/RoutesApp.tsx b/src/modules/application/containers/App/RoutesApp.tsx
index 36516dce01..ca91e822b3 100644
--- a/src/modules/application/containers/App/RoutesApp.tsx
+++ b/src/modules/application/containers/App/RoutesApp.tsx
@@ -36,6 +36,9 @@ const EthFlowFaq = lazy(() => import(/* webpackChunkName: "eth_flow_faq" */ 'pag
 const AccountTokensOverview = lazy(() => import(/* webpackChunkName: "tokens_overview" */ 'pages/Account/Tokens'))
 const AccountNotFound = lazy(() => import(/* webpackChunkName: "affiliate" */ 'pages/error/NotFound'))
 
+// Misc
+const KitchenSink = lazy(() => import(/* webpackChunkName: "kitchen_sink" */ 'pages/KitchenSink'))
+
 function createRedirectExternal(url: string) {
   return () => {
     window.location.replace(url)
@@ -64,6 +67,7 @@ const lazyRoutes: LazyRouteProps[] = [
   { route: RoutesEnum.PRIVACY_POLICY, element: <PrivacyPolicy /> },
   { route: RoutesEnum.COOKIE_POLICY, element: <CookiePolicy /> },
   { route: RoutesEnum.TERMS_CONDITIONS, element: <TermsAndConditions /> },
+  { route: RoutesEnum.KITCHEN_SINK, element: <KitchenSink /> },
 ]
 
 export function RoutesApp() {
diff --git a/src/pages/KitchenSink/index.tsx b/src/pages/KitchenSink/index.tsx
index d5ffd16513..c08a38a97a 100644
--- a/src/pages/KitchenSink/index.tsx
+++ b/src/pages/KitchenSink/index.tsx
@@ -1,4 +1,6 @@
 import { PinkTitle } from '@cowprotocol/ui'
+import { CowSwapWidgetSettings } from '@cowprotocol/widget-lib'
+import { CowSwapWidget, CowSwapWidgetParams } from '@cowprotocol/widget-react'
 
 import styled from 'styled-components/macro'
 
@@ -7,11 +9,31 @@ import { Page, Title, Content } from 'modules/application/pure/Page'
 const Wrapper = styled(Page)``
 
 export default function KitchenSink() {
+  const cowSwapWidgetParams: CowSwapWidgetParams = {
+    width: 600,
+    height: 700,
+    metaData: {
+      appKey: 'KitchenSink',
+      url: '/',
+    },
+  }
+
+  const cowSwapWidgetSettings: CowSwapWidgetSettings = {
+    urlParams: {
+      chainId: 1,
+      tradeType: 'swap',
+      env: 'local',
+    },
+    appParams: {},
+  }
+
   return (
     <Wrapper>
       <Title>Kitchen Sink</Title>
       <Content>
         <PinkTitle>pink title</PinkTitle>
+
+        <CowSwapWidget params={cowSwapWidgetParams} settings={cowSwapWidgetSettings} />
       </Content>
     </Wrapper>
   )
diff --git a/tsconfig.base.json b/tsconfig.base.json
index a8bde00a51..398213a384 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -26,7 +26,8 @@
     "paths": {
       "@cowprotocol/ui": ["libs/ui/src/index.ts"],
       "@cowprotocol/ui-utils": ["libs/ui-utils/src/index.ts"],
-      "@cowprotocol/widget-lib": ["src/libs/widget-lib/src/index.ts"]
+      "@cowprotocol/widget-lib": ["libs/widget-lib/src/index.ts"],
+      "@cowprotocol/widget-react": ["libs/widget-react/src/index.ts"]
     }
   },
   "exclude": ["node_modules", "cypress"]

From 7534721ae879254de8bc5af62e8a6aeeb25a1df6 Mon Sep 17 00:00:00 2001
From: Leandro <alfetopito@users.noreply.github.com>
Date: Fri, 30 Jun 2023 03:22:52 -0700
Subject: [PATCH 41/67] feat(hackathon-surplus): add surplus data to activity
 details (#2751)

* chore: add temporary fn to fetch surplus from backend

* chore: typo

* chore: upgrade swr to latest

* feat: add hook useSurplusAmount

* feat: add SurplusCard - styling not included

* feat: add SurplusCard to AccountDetails

* chore: do not render SurplusCard if network is not supported
---
 package.json                                  |  2 +-
 src/api/gnosisProtocol/api.ts                 | 40 ++++++++++++----
 src/api/gnosisProtocol/hooks.ts               | 36 +++++++++++++-
 .../containers/AccountDetails/SurplusCard.tsx | 47 +++++++++++++++++++
 .../containers/AccountDetails/index.tsx       | 38 ++++++++-------
 src/utils/amountFormat/index.ts               |  6 +--
 yarn.lock                                     | 12 +++--
 7 files changed, 146 insertions(+), 35 deletions(-)
 create mode 100644 src/modules/account/containers/AccountDetails/SurplusCard.tsx

diff --git a/package.json b/package.json
index debb086d11..7de4bb8f2e 100644
--- a/package.json
+++ b/package.json
@@ -188,7 +188,7 @@
     "simple-sitemap-renderer": "^1.1.0",
     "styled-components": "^5.3.0",
     "styled-jsx": "5.1.2",
-    "swr": "^1.0.1",
+    "swr": "^2.2.0",
     "text-encoding-polyfill": "^0.6.7",
     "timeago.js": "^4.0.2",
     "tiny-invariant": "^1.2.0",
diff --git a/src/api/gnosisProtocol/api.ts b/src/api/gnosisProtocol/api.ts
index 4c5d97fe23..f00b136aaa 100644
--- a/src/api/gnosisProtocol/api.ts
+++ b/src/api/gnosisProtocol/api.ts
@@ -1,17 +1,17 @@
 import {
-  OrderBookApiError,
-  PriceQuality,
-  SupportedChainId as ChainId,
+  Address,
   CowEnv,
+  EnrichedOrder,
+  NativePriceResponse,
+  OrderBookApiError,
   OrderKind,
   OrderQuoteRequest,
-  SigningScheme,
   OrderQuoteResponse,
-  EnrichedOrder,
-  NativePriceResponse,
-  Trade,
   PartialApiContext,
-  Address,
+  PriceQuality,
+  SigningScheme,
+  SupportedChainId as ChainId,
+  Trade,
 } from '@cowprotocol/cow-sdk'
 
 import { orderBookApi } from 'cowSdk'
@@ -200,3 +200,27 @@ export async function getProfileData(chainId: ChainId, address: string): Promise
     return response.json()
   }
 }
+
+const NETWORK_TO_API_PREFIX = {
+  [ChainId.MAINNET]: 'mainnet',
+  [ChainId.GOERLI]: 'goerli',
+  [ChainId.GNOSIS_CHAIN]: 'xdai',
+}
+
+export type TotalSurplusData = {
+  totalSurplus: string
+}
+
+// TODO: Move to the SDK
+export async function getSurplusData(chainId: ChainId, address: string): Promise<TotalSurplusData> {
+  console.log(`[api:${API_NAME}] Get surplus data for`, chainId, address)
+
+  const baseUrl = `https://barn.api.cow.fi/${NETWORK_TO_API_PREFIX[chainId]}/api`
+  const url = `/v1/users/${address}/total_surplus`
+
+  const response = await fetch(baseUrl + url, {
+    headers: DEFAULT_HEADERS,
+  })
+
+  return response.json()
+}
diff --git a/src/api/gnosisProtocol/hooks.ts b/src/api/gnosisProtocol/hooks.ts
index 7c4c78a3a5..7dc8b6602a 100644
--- a/src/api/gnosisProtocol/hooks.ts
+++ b/src/api/gnosisProtocol/hooks.ts
@@ -2,8 +2,10 @@ import { useAtomValue } from 'jotai'
 import { useMemo } from 'react'
 
 import { EnrichedOrder } from '@cowprotocol/cow-sdk'
+import { Currency, CurrencyAmount } from '@uniswap/sdk-core'
 
 import useSWR from 'swr'
+import { Nullish } from 'types'
 
 import { AMOUNT_OF_ORDERS_TO_FETCH } from 'legacy/constants'
 import { isBarnBackendEnv } from 'legacy/utils/environments'
@@ -15,8 +17,9 @@ import { TwapPartOrderItem, twapPartOrdersListAtom } from 'modules/twap/state/tw
 import { useWalletInfo } from 'modules/wallet'
 
 import { OrderWithComposableCowInfo } from 'common/types'
+import useNativeCurrency from 'lib/hooks/useNativeCurrency'
 
-import { getOrders } from './api'
+import { getOrders, getSurplusData } from './api'
 
 /**
  * TODO: refactor this hook
@@ -117,3 +120,34 @@ export function useHasOrders(account?: string | null): boolean | undefined {
 
   return (gpOrders?.length || 0) > 0
 }
+
+export type UseSurplusAmountResult = {
+  surplusAmount: Nullish<CurrencyAmount<Currency>>
+  isLoading: boolean
+  error: string
+}
+
+export function useSurplusAmount(): UseSurplusAmountResult {
+  const { chainId, account } = useWalletInfo()
+  const nativeCurrency = useNativeCurrency()
+
+  const {
+    data: surplusAmount,
+    isLoading,
+    error,
+  } = useSWR<CurrencyAmount<Currency> | null>(['totalSurplus', chainId, account], async () => {
+    if (!chainId || !account) {
+      return null
+    }
+
+    const surplusData = await getSurplusData(chainId, account)
+
+    if (!surplusData?.totalSurplus) {
+      return null
+    }
+
+    return CurrencyAmount.fromRawAmount(nativeCurrency, surplusData.totalSurplus)
+  })
+
+  return { surplusAmount, isLoading, error }
+}
diff --git a/src/modules/account/containers/AccountDetails/SurplusCard.tsx b/src/modules/account/containers/AccountDetails/SurplusCard.tsx
new file mode 100644
index 0000000000..fcd01cddca
--- /dev/null
+++ b/src/modules/account/containers/AccountDetails/SurplusCard.tsx
@@ -0,0 +1,47 @@
+import { MouseoverTooltipContent } from 'legacy/components/Tooltip'
+import { useHigherUSDValue } from 'legacy/hooks/useStablecoinPrice'
+import { ExternalLink } from 'legacy/theme'
+import { supportedChainId } from 'legacy/utils/supportedChainId'
+
+import { useWalletInfo } from 'modules/wallet'
+
+import { useSurplusAmount } from 'api/gnosisProtocol/hooks'
+import { FiatAmount } from 'common/pure/FiatAmount'
+import { HelpCircle } from 'common/pure/HelpCircle'
+import { TokenAmount } from 'common/pure/TokenAmount'
+
+import { InfoCard } from './styled'
+
+export function SurplusCard() {
+  const { surplusAmount, isLoading } = useSurplusAmount()
+
+  const surplusUsdAmount = useHigherUSDValue(surplusAmount)
+
+  const { chainId } = useWalletInfo()
+
+  if (!supportedChainId(chainId)) return null
+
+  return (
+    <InfoCard>
+      <span>
+        Your total surplus{' '}
+        <MouseoverTooltipContent content={'TODO: insert tooltip'} wrap>
+          <HelpCircle size={14} />
+        </MouseoverTooltipContent>
+      </span>
+      <span>
+        {isLoading
+          ? 'Loading...'
+          : surplusAmount && (
+              <>
+                +<TokenAmount amount={surplusAmount} tokenSymbol={surplusAmount?.currency} />
+              </>
+            )}
+        {!surplusAmount && 'No surplus for the given time period'}
+      </span>
+      {surplusUsdAmount && <FiatAmount amount={surplusUsdAmount} accurate={false} />}
+      {/* TODO: add correct link */}
+      <ExternalLink href={'https://swap.cow.fi'}>Learn about surplus on CoW Swap ↗</ExternalLink>
+    </InfoCard>
+  )
+}
diff --git a/src/modules/account/containers/AccountDetails/index.tsx b/src/modules/account/containers/AccountDetails/index.tsx
index 5c747a56fe..3cc7777b84 100644
--- a/src/modules/account/containers/AccountDetails/index.tsx
+++ b/src/modules/account/containers/AccountDetails/index.tsx
@@ -9,18 +9,19 @@ import { Trans } from '@lingui/macro'
 import Copy from 'legacy/components/Copy'
 import { MouseoverTooltip } from 'legacy/components/Tooltip'
 import UnsupporthedNetworkMessage from 'legacy/components/UnsupportedNetworkMessage'
-import { groupActivitiesByDay, useMultipleActivityDescriptors } from 'legacy/hooks/useRecentActivity'
-import { ActivityDescriptors } from 'legacy/hooks/useRecentActivity'
+import {
+  ActivityDescriptors,
+  groupActivitiesByDay,
+  useMultipleActivityDescriptors,
+} from 'legacy/hooks/useRecentActivity'
 import { ExternalLink } from 'legacy/theme'
-import { getEtherscanLink } from 'legacy/utils'
-import { getExplorerLabel, shortenAddress } from 'legacy/utils'
+import { getEtherscanLink, getExplorerLabel, shortenAddress } from 'legacy/utils'
 import { getExplorerAddressLink } from 'legacy/utils/explorer'
 import { supportedChainId } from 'legacy/utils/supportedChainId'
 import { isMobile } from 'legacy/utils/userAgent'
 
 import Activity from 'modules/account/containers/Transaction'
-import { ConnectionType, useWalletInfo, WalletDetails } from 'modules/wallet'
-import { useDisconnectWallet } from 'modules/wallet'
+import { ConnectionType, useDisconnectWallet, useWalletInfo, WalletDetails } from 'modules/wallet'
 import CoinbaseWalletIcon from 'modules/wallet/api/assets/coinbase.svg'
 import FortmaticIcon from 'modules/wallet/api/assets/formatic.png'
 import KeystoneImage from 'modules/wallet/api/assets/keystone.svg'
@@ -48,23 +49,24 @@ import { walletConnectConnection } from 'modules/wallet/web3-react/connection/wa
 import { walletConnectConnectionV2 } from 'modules/wallet/web3-react/connection/walletConnectV2'
 
 import {
-  NetworkCard,
-  Wrapper,
-  InfoCard,
+  AccountControl,
   AccountGroupingRow,
-  NoActivityMessage,
+  AddressLink,
+  IconWrapper,
+  InfoCard,
   LowerSection,
+  NetworkCard,
+  NoActivityMessage,
+  TransactionListWrapper,
+  WalletAction,
   WalletActions,
-  WalletSecondaryActions,
+  WalletName,
   WalletNameAddress,
+  WalletSecondaryActions,
   WalletWrapper,
-  WalletName,
-  WalletAction,
-  AccountControl,
-  AddressLink,
-  IconWrapper,
-  TransactionListWrapper,
+  Wrapper,
 } from './styled'
+import { SurplusCard } from './SurplusCard'
 
 import { CreationDateText } from '../Transaction/styled'
 
@@ -274,6 +276,8 @@ export function AccountDetails({
         </AccountGroupingRow>
       </InfoCard>
 
+      <SurplusCard />
+
       {activityTotalCount ? (
         <LowerSection>
           <span>
diff --git a/src/utils/amountFormat/index.ts b/src/utils/amountFormat/index.ts
index f9b1921f3f..457f0d8759 100644
--- a/src/utils/amountFormat/index.ts
+++ b/src/utils/amountFormat/index.ts
@@ -45,10 +45,10 @@ export function formatAmountWithPrecision(
   const decimalsSeparator = numberFormat.format(1.1)[1]
 
   // Trim the remainder up to precision
-  const reminderWithPrecission = remainder.toFixed(precision, undefined, Rounding.ROUND_HALF_UP)
+  const reminderWithPrecision = remainder.toFixed(precision, undefined, Rounding.ROUND_HALF_UP)
 
   // If rounding up means we carry over to the next integer, add 1 to quotient
-  const adjustedQuotient = +reminderWithPrecission >= 1 ? JSBI.add(quotient, JSBI.BigInt(1)) : quotient
+  const adjustedQuotient = +reminderWithPrecision >= 1 ? JSBI.add(quotient, JSBI.BigInt(1)) : quotient
 
   // Apply the language formatting for the amount
   // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/NumberFormat
@@ -57,7 +57,7 @@ export function formatAmountWithPrecision(
   )
 
   // Remove trailing zeros
-  const reminderWithotTrailingZeros = trimTrailingZeros(reminderWithPrecission)
+  const reminderWithotTrailingZeros = trimTrailingZeros(reminderWithPrecision)
 
   // Make sure the reminder is internationalised
   const formattedRemainder =
diff --git a/yarn.lock b/yarn.lock
index 8b85efb5ab..fc4faf1472 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -23002,10 +23002,12 @@ swarm-js@^0.1.40:
     tar "^4.0.2"
     xhr-request "^1.0.1"
 
-swr@^1.0.1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/swr/-/swr-1.3.0.tgz#c6531866a35b4db37b38b72c45a63171faf9f4e8"
-  integrity sha512-dkghQrOl2ORX9HYrMDtPa7LTVHJjCTeZoB1dqTbnnEDlSvN8JEKpYIYurDfvbQFUUS8Cg8PceFVZNkW0KNNYPw==
+swr@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/swr/-/swr-2.2.0.tgz#575c6ac1bec087847f4c86a39ccbc0043c834d6a"
+  integrity sha512-AjqHOv2lAhkuUdIiBu9xbuettzAzWXmCEcLONNKJRba87WAefz8Ca9d6ds/SzrPc235n1IxWYdhJ2zF3MNUaoQ==
+  dependencies:
+    use-sync-external-store "^1.2.0"
 
 symbol-tree@^3.2.4:
   version "3.2.4"
@@ -24051,7 +24053,7 @@ use-sidecar@^1.0.1, use-sidecar@^1.0.5:
     detect-node-es "^1.1.0"
     tslib "^2.0.0"
 
-use-sync-external-store@1.2.0, use-sync-external-store@^1.0.0:
+use-sync-external-store@1.2.0, use-sync-external-store@^1.0.0, use-sync-external-store@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz#7dbefd6ef3fe4e767a0cf5d7287aacfb5846928a"
   integrity sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==

From 7240bbc26470ae701cbdfa4b1ad70ee92923dea3 Mon Sep 17 00:00:00 2001
From: Leandro <alfetopito@users.noreply.github.com>
Date: Fri, 30 Jun 2023 03:24:30 -0700
Subject: [PATCH 42/67] feat(hackathon-surplus): add new surplus modal when
 order filled (#2752)

* chore: reduce modal width when order is filled

* feat: add SurplusModal

* feat: display SurplusModal inside TransactionSubmittedModal once order is filled

* chore: add exclamation mark after token amount
---
 .../SurplusModal.tsx                          | 48 +++++++++++++++++++
 .../TransactionSubmittedContent/index.tsx     | 46 ++++++++++--------
 .../TransactionConfirmationModal/index.tsx    | 19 ++++++--
 3 files changed, 91 insertions(+), 22 deletions(-)
 create mode 100644 src/common/pure/TransactionSubmittedContent/SurplusModal.tsx

diff --git a/src/common/pure/TransactionSubmittedContent/SurplusModal.tsx b/src/common/pure/TransactionSubmittedContent/SurplusModal.tsx
new file mode 100644
index 0000000000..9c51d16f27
--- /dev/null
+++ b/src/common/pure/TransactionSubmittedContent/SurplusModal.tsx
@@ -0,0 +1,48 @@
+import { OrderKind } from '@cowprotocol/cow-sdk'
+
+import { Order } from 'legacy/state/orders/actions'
+import { ExternalLink } from 'legacy/theme'
+
+import { useGetSurplusData } from 'common/hooks/useGetSurplusFiatValue'
+import { FiatAmount } from 'common/pure/FiatAmount'
+import { TokenAmount } from 'common/pure/TokenAmount'
+
+const SELL_SURPLUS_WORD = 'got'
+const BUY_SURPLUS_WORD = 'saved'
+
+export type SurplusModalProps = {
+  order: Order | undefined
+}
+
+export function SurplusModal(props: SurplusModalProps) {
+  const { order } = props
+
+  const { surplusFiatValue, showFiatValue, surplusToken, surplusAmount } = useGetSurplusData(order)
+
+  if (!order) {
+    return null
+  }
+
+  const surplusMsg = `You ${order.kind === OrderKind.SELL ? SELL_SURPLUS_WORD : BUY_SURPLUS_WORD} an extra`
+
+  return (
+    <div style={{ display: 'flex', flexDirection: 'column', alignItems: 'center' }}>
+      <h2>Swap completed</h2>
+      {/* TODO: add image */}
+      <span>--nice image here--</span>
+      <span>Great! {surplusMsg}</span>
+      <strong>
+        <TokenAmount amount={surplusAmount} tokenSymbol={surplusToken} />!
+      </strong>
+      {showFiatValue && <FiatAmount amount={surplusFiatValue} accurate={false} />}
+      {/* TODO: add twitter button with styles */}
+      {/* TODO: add share data */}
+      <ExternalLink href="https://cow.fi">Share this win!</ExternalLink>
+      {/* TODO: add proper link */}
+      <span>
+        CoW Swap is the only token exchange that gets you extra tokens.{' '}
+        <ExternalLink href={'https://cow.fi'}>Learn how ↗</ExternalLink>
+      </span>
+    </div>
+  )
+}
diff --git a/src/common/pure/TransactionSubmittedContent/index.tsx b/src/common/pure/TransactionSubmittedContent/index.tsx
index d7c6db7b70..d3f22aa760 100644
--- a/src/common/pure/TransactionSubmittedContent/index.tsx
+++ b/src/common/pure/TransactionSubmittedContent/index.tsx
@@ -21,6 +21,7 @@ import AddToMetamask from 'modules/wallet/web3-react/containers/AddToMetamask'
 import { Routes } from 'common/constants/routes'
 
 import * as styledEl from './styled'
+import { SurplusModal } from './SurplusModal'
 
 const activityStatusLabels: Partial<Record<ActivityStatus, string>> = {
   [ActivityStatus.CONFIRMED]: 'Confirmed',
@@ -58,6 +59,7 @@ export function TransactionSubmittedContent({
   const activityState = activityDerivedState && getActivityState(activityDerivedState)
   const showProgressBar = activityState === 'open' || activityState === 'filled'
   const { order } = activityDerivedState || {}
+  const showSurplus = activityState === 'filled'
 
   if (!supportedChainId(chainId)) {
     return null
@@ -69,26 +71,32 @@ export function TransactionSubmittedContent({
         <styledEl.Header>
           <styledEl.CloseIconWrapper onClick={onDismiss} />
         </styledEl.Header>
-        <Text fontWeight={600} fontSize={28}>
-          {getTitleStatus(activityDerivedState)}
-        </Text>
-        <DisplayLink id={hash} chainId={chainId} />
-        <EthFlowStepper order={order} />
-        {/*TODO: refactor OrderProgressBar to make it pure*/}
-        {activityDerivedState && showProgressBar && (
-          <OrderProgressBar hash={hash} activityDerivedState={activityDerivedState} chainId={chainId} />
-        )}
-        <styledEl.ButtonGroup>
-          {/*TODO: refactor AddToMetamask to make it pure*/}
-          <AddToMetamask shortLabel currency={currencyToAdd} />
+        {showSurplus ? (
+          <SurplusModal order={order} />
+        ) : (
+          <>
+            <Text fontWeight={600} fontSize={28}>
+              {getTitleStatus(activityDerivedState)}
+            </Text>
+            <DisplayLink id={hash} chainId={chainId} />
+            <EthFlowStepper order={order} />
+            {/*TODO: refactor OrderProgressBar to make it pure*/}
+            {activityDerivedState && showProgressBar && (
+              <OrderProgressBar hash={hash} activityDerivedState={activityDerivedState} chainId={chainId} />
+            )}
+            <styledEl.ButtonGroup>
+              {/*TODO: refactor AddToMetamask to make it pure*/}
+              <AddToMetamask shortLabel currency={currencyToAdd} />
 
-          <styledEl.ButtonCustom>
-            <Link to={Routes.PLAY_COWRUNNER} onClick={onDismiss}>
-              <styledEl.StyledIcon src={GameIcon} alt="Play CowGame" />
-              Play the CoW Runner Game!
-            </Link>
-          </styledEl.ButtonCustom>
-        </styledEl.ButtonGroup>
+              <styledEl.ButtonCustom>
+                <Link to={Routes.PLAY_COWRUNNER} onClick={onDismiss}>
+                  <styledEl.StyledIcon src={GameIcon} alt="Play CowGame" />
+                  Play the CoW Runner Game!
+                </Link>
+              </styledEl.ButtonCustom>
+            </styledEl.ButtonGroup>
+          </>
+        )}
       </styledEl.Section>
     </styledEl.Wrapper>
   )
diff --git a/src/legacy/components/TransactionConfirmationModal/index.tsx b/src/legacy/components/TransactionConfirmationModal/index.tsx
index 024df08073..091cf91f5d 100644
--- a/src/legacy/components/TransactionConfirmationModal/index.tsx
+++ b/src/legacy/components/TransactionConfirmationModal/index.tsx
@@ -2,10 +2,11 @@ import React, { ReactNode } from 'react'
 
 import { Currency } from '@uniswap/sdk-core'
 
-import { useActivityDerivedState } from 'legacy/hooks/useActivityDerivedState'
+import { getActivityState, useActivityDerivedState } from 'legacy/hooks/useActivityDerivedState'
 import { useMultipleActivityDescriptors } from 'legacy/hooks/useRecentActivity'
 import { handleFollowPendingTxPopupAtom, useUpdateAtom } from 'legacy/state/application/atoms'
 
+import { ActivityDerivedState } from 'modules/account/containers/Transaction'
 import { useWalletInfo } from 'modules/wallet'
 
 import { GpModal } from 'common/pure/Modal'
@@ -44,6 +45,8 @@ export function TransactionConfirmationModal({
 
   if (!chainId) return null
 
+  const width = getWidth(hash, activityDerivedState)
+
   const _onDismiss =
     !attemptingTxn && hash
       ? () => {
@@ -53,7 +56,7 @@ export function TransactionConfirmationModal({
       : onDismiss
 
   return (
-    <GpModal isOpen={isOpen} onDismiss={_onDismiss} maxHeight={90} maxWidth={hash ? 850 : 470}>
+    <GpModal isOpen={isOpen} onDismiss={_onDismiss} maxHeight={90} maxWidth={width}>
       {attemptingTxn ? (
         <LegacyConfirmationPendingContent
           chainId={chainId}
@@ -70,8 +73,18 @@ export function TransactionConfirmationModal({
           currencyToAdd={currencyToAdd}
         />
       ) : (
-        content && content()
+        content?.()
       )}
     </GpModal>
   )
 }
+
+function getWidth(hash: string | undefined, activityDerivedState: ActivityDerivedState | null): number {
+  if (activityDerivedState && getActivityState(activityDerivedState) === 'filled') {
+    return 400
+  }
+  if (hash) {
+    return 850
+  }
+  return 470
+}

From 010fdc313b75631839ccd4f513cccedc4ce3feec Mon Sep 17 00:00:00 2001
From: Anxo Rodriguez <anxolin@gmail.com>
Date: Fri, 30 Jun 2023 13:51:23 +0100
Subject: [PATCH 43/67] chore: add abis library (+fix e2e, cosmos, unit test)
 (#2753)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore: add abis library

* chore: delete un-used univ3 types

* chore: cleanup

* chore: do not ignore abi

* chore: do not re-generate types

* Fix code style issues with Prettier

* chore: simlify lib

* chore: fix the only type we were using from v3

* chore: fix lint

* chore: make linting faster

* Fix code style issues with Prettier

* fix: disable test for now, why absolute path is not working for libs 😭

* fix: :bug: fix issue with generated types not being visible to spec files

* Fix code style issues with ESLint

* Fix code style issues with Prettier

* chore: remove some not needed ABIs

* chore: delete some unused multicall abis

* Fix code style issues with Prettier

* chore: add ignores

* chore: generate without eslint style

* test: test to use install instead of prepare

* Fix code style issues with Prettier

* test: move dependency to the root

* chore: simplify i18n

* test: debug

* chore: delete unneded files

---------

Co-authored-by: Lint Action <lint-action@samuelmeuli.com>
Co-authored-by: Tukan van der Borgh <tukanvdborgh@proton.me>
---
 .eslintrc.json                                |    1 +
 .../ISSUE_TEMPLATE/bug-report.md              |   22 -
 .../ISSUE_TEMPLATE/config.yml                 |    8 -
 .../ISSUE_TEMPLATE/feature-request.md         |   19 -
 .../uniswap-original/actions/setup/action.yml |   21 -
 .github/uniswap-original/bundle.yaml          |   40 -
 .../workflows/check-pr-title.yaml             |   17 -
 .../workflows/crowdin-sync.yaml               |   33 -
 .../uniswap-original/workflows/crowdin.yaml   |   26 -
 .../workflows/integration-tests.yaml          |   51 -
 .github/uniswap-original/workflows/lint.yml   |   51 -
 .../uniswap-original/workflows/release.yaml   |  122 --
 .github/uniswap-original/workflows/test.yml   |  103 --
 .github/uniswap-original/workflows/tests.yaml |   64 -
 .../workflows/unit-tests.yaml                 |   40 -
 .github/workflows/ci.yml                      |    9 +-
 .gitignore                                    |    5 +-
 README.md                                     |    1 +
 craco.config.js                               |    9 +
 nx.json                                       |    2 +-
 package.json                                  |   47 +-
 project.json                                  |    2 +-
 scripts/contracts_add_export.js               |   25 -
 src/common/hooks/useApproveCallback.ts        |    2 +-
 .../useCancelOrder/onChainCancellation.ts     |    4 +-
 .../useShouldZeroApprove/shouldZeroApprove.ts |    2 +-
 src/legacy/abis/governor-bravo.json           | 1046 -----------
 src/legacy/abis/multicall.json                |  330 ----
 src/legacy/abis/multicall2.json               |  165 --
 .../abis/types/ArgentWalletContract.d.ts      |  156 --
 src/legacy/abis/types/ArgentWalletContract.ts |  173 --
 .../abis/types/ArgentWalletDetector.d.ts      |  387 ----
 src/legacy/abis/types/ArgentWalletDetector.ts |  421 -----
 src/legacy/abis/types/Eip2612.d.ts            |  117 --
 src/legacy/abis/types/Eip_2612.ts             |  121 --
 src/legacy/abis/types/EnsPublicResolver.d.ts  | 1132 ------------
 src/legacy/abis/types/EnsPublicResolver.ts    | 1265 -------------
 src/legacy/abis/types/EnsRegistrar.d.ts       |  607 -------
 src/legacy/abis/types/EnsRegistrar.ts         |  691 -------
 src/legacy/abis/types/Erc1155.d.ts            |  134 --
 src/legacy/abis/types/Erc1155.ts              |  137 --
 src/legacy/abis/types/Erc20.d.ts              |  366 ----
 src/legacy/abis/types/Erc20.ts                |  384 ----
 src/legacy/abis/types/Erc20Bytes32.d.ts       |  108 --
 src/legacy/abis/types/Erc20_bytes32.ts        |   95 -
 src/legacy/abis/types/Erc721.d.ts             |  132 --
 src/legacy/abis/types/Erc721.ts               |  132 --
 src/legacy/abis/types/GovernorBravo.d.ts      | 1574 ----------------
 src/legacy/abis/types/GovernorBravo.ts        | 1580 -----------------
 src/legacy/abis/types/Multicall.d.ts          |  482 -----
 src/legacy/abis/types/Multicall.ts            |  482 -----
 src/legacy/abis/types/Multicall2.d.ts         |  449 -----
 src/legacy/abis/types/Multicall2.ts           |  467 -----
 src/legacy/abis/types/Unisocks.d.ts           |  782 --------
 src/legacy/abis/types/Unisocks.ts             |  857 ---------
 src/legacy/abis/types/Weth.d.ts               |  441 -----
 src/legacy/abis/types/Weth.ts                 |  480 -----
 src/legacy/abis/types/common.d.ts             |   35 -
 src/legacy/abis/types/common.ts               |   46 -
 .../ArgentWalletContract__factory.ts          |   89 -
 .../ArgentWalletDetector__factory.ts          |  243 ---
 .../abis/types/factories/Eip2612__factory.ts  |   56 -
 .../abis/types/factories/Eip_2612__factory.ts |   56 -
 .../factories/EnsPublicResolver__factory.ts   |  840 ---------
 .../types/factories/EnsRegistrar__factory.ts  |  443 -----
 .../abis/types/factories/Erc1155__factory.ts  |   70 -
 .../types/factories/Erc20Bytes32__factory.ts  |   51 -
 .../abis/types/factories/Erc20__factory.ts    |  240 ---
 .../types/factories/Erc20_bytes32__factory.ts |   51 -
 .../abis/types/factories/Erc721__factory.ts   |   58 -
 .../types/factories/GovernorBravo__factory.ts | 1067 -----------
 .../types/factories/Multicall2__factory.ts    |  334 ----
 .../types/factories/Multicall__factory.ts     |  351 ----
 .../abis/types/factories/Unisocks__factory.ts |  492 -----
 .../abis/types/factories/Weth__factory.ts     |  297 ----
 src/legacy/abis/types/factories/index.ts      |   17 -
 src/legacy/abis/types/index.ts                |   32 -
 src/legacy/abis/unisocks.json                 |  471 -----
 src/legacy/constants/index.ts                 |    3 +-
 src/legacy/hooks/useArgentWalletContract.ts   |    5 +-
 src/legacy/hooks/useContract.ts               |   68 +-
 src/legacy/hooks/useTokenLazy.ts              |    2 +-
 src/legacy/state/claim/hooks/index.ts         |    6 +-
 .../orders/middleware/appziMiddleware.test.ts |    2 +-
 src/legacy/utils/approveAmountCalldata.ts     |    3 +-
 src/libs/abis/.eslintrc.json                  |   18 +
 src/libs/abis/README.md                       |   23 +
 src/libs/abis/jest.config.ts                  |   10 +
 src/libs/abis/package.json                    |    5 +
 src/libs/abis/project.json                    |   49 +
 .../UniswapInterfaceMulticall.json            |  101 ++
 .../abis-legacy}/argent-wallet-contract.json  |    0
 .../abis-legacy}/argent-wallet-detector.json  |    0
 .../abis/src/abis-legacy}/eip_2612.json       |    0
 .../src/abis-legacy}/ens-public-resolver.json |    0
 .../abis/src/abis-legacy}/ens-registrar.json  |    0
 .../abis/src/abis-legacy}/erc1155.json        |    0
 .../abis/src/abis-legacy}/erc20.json          |    0
 .../abis/src/abis-legacy}/erc20_bytes32.json  |    0
 .../abis/src/abis-legacy}/erc721.json         |    0
 .../abis/src/abis-legacy}/weth.json           |    0
 .../abis/src}/abis/ComposableCoW.json         |    0
 .../src}/abis/ExtensibleFallbackHandler.json  |    0
 .../abis/src}/abis/GPv2Settlement.json        |    0
 src/{ => libs/abis/src}/abis/MerkleDrop.json  |    0
 .../src}/abis/SignatureVerifierMuxer.json     |    0
 src/{ => libs/abis/src}/abis/TokenDistro.json |    0
 src/{ => libs/abis/src}/abis/vCow.json        |    0
 .../src/generated/custom/ComposableCoW.ts     |  301 ++++
 .../custom/ExtensibleFallbackHandler.ts       |  208 +++
 .../src/generated/custom/GPv2Settlement.ts    |  171 ++
 .../abis/src/generated/custom/MerkleDrop.ts   |  103 ++
 .../custom/SignatureVerifierMuxer.ts          |  158 ++
 .../abis/src/generated/custom/TokenDistro.ts  |  106 ++
 src/libs/abis/src/generated/custom/VCow.ts    |  355 ++++
 src/libs/abis/src/generated/custom/common.ts  |   32 +
 .../factories/ComposableCoW__factory.ts       |  217 +++
 .../ExtensibleFallbackHandler__factory.ts     |  166 ++
 .../factories/GPv2Settlement__factory.ts      |  112 ++
 .../custom/factories/MerkleDrop__factory.ts   |   43 +
 .../SignatureVerifierMuxer__factory.ts        |   74 +
 .../custom/factories/TokenDistro__factory.ts  |   51 +
 .../custom/factories/VCow__factory.ts         |  273 +++
 .../src/generated/custom/factories/index.ts   |   10 +
 src/libs/abis/src/generated/custom/index.ts   |   18 +
 .../src/generated/ethflow/CoWSwapEthFlow.ts   |  448 +++++
 src/libs/abis/src/generated/ethflow/common.ts |   32 +
 .../factories/CoWSwapEthFlow__factory.ts      |  555 ++++++
 .../src/generated/ethflow/factories/index.ts  |    4 +
 src/libs/abis/src/generated/ethflow/index.ts  |    6 +
 .../generated/legacy/ArgentWalletContract.ts  |  155 ++
 .../generated/legacy/ArgentWalletDetector.ts  |  307 ++++
 .../abis/src/generated/legacy/Eip_2612.ts     |   77 +
 .../src/generated/legacy/EnsPublicResolver.ts |  999 +++++++++++
 .../abis/src/generated/legacy/EnsRegistrar.ts |  540 ++++++
 src/libs/abis/src/generated/legacy/Erc1155.ts |  109 ++
 src/libs/abis/src/generated/legacy/Erc20.ts   |  330 ++++
 .../src/generated/legacy/Erc20_bytes32.ts     |   77 +
 src/libs/abis/src/generated/legacy/Erc721.ts  |   86 +
 .../legacy/UniswapInterfaceMulticall.ts       |  150 ++
 src/libs/abis/src/generated/legacy/Weth.ts    |  373 ++++
 src/libs/abis/src/generated/legacy/common.ts  |   32 +
 .../ArgentWalletContract__factory.ts          |   79 +
 .../ArgentWalletDetector__factory.ts          |  233 +++
 .../legacy/factories/Eip_2612__factory.ts     |   53 +
 .../factories/EnsPublicResolver__factory.ts   |  834 +++++++++
 .../legacy/factories/EnsRegistrar__factory.ts |  440 +++++
 .../legacy/factories/Erc1155__factory.ts      |   67 +
 .../legacy/factories/Erc20__factory.ts        |  240 +++
 .../factories/Erc20_bytes32__factory.ts       |   48 +
 .../legacy/factories/Erc721__factory.ts       |   58 +
 .../UniswapInterfaceMulticall__factory.ts     |  141 ++
 .../legacy/factories/Weth__factory.ts         |  297 ++++
 .../src/generated/legacy/factories/index.ts   |   14 +
 src/libs/abis/src/generated/legacy/index.ts   |   26 +
 src/libs/abis/src/index.ts                    |   42 +
 src/libs/abis/tsconfig.json                   |   22 +
 src/libs/abis/tsconfig.lib.json               |   10 +
 src/libs/abis/tsconfig.spec.json              |    9 +
 src/libs/abis/vite.config.ts                  |   48 +
 src/libs/abis/yarn.lock                       |    4 +
 .../src/lib/CowSwapWidget.spec.tsx            |    7 +-
 src/libs/widget-react/vite.config.ts          |    6 +-
 .../hooks/useComposableCowContract.ts         |    7 +-
 src/modules/limitOrders/services/types.ts     |    4 +-
 .../operations/bundle/buildApproveTx.ts       |    3 +-
 .../operations/bundle/buildPresignTx.ts       |    2 +-
 src/modules/operations/bundle/buildWrapTx.ts  |    2 +-
 src/modules/swap/hooks/useFlowContext.ts      |    2 +-
 .../ethFlow/steps/calculateUniqueOrderId.ts   |    2 +-
 .../ethFlow/steps/signEthFlowOrderStep.ts     |    3 +-
 .../safeBundleFlow/safeBundleEthFlow.ts       |    2 +-
 .../swapFlow/steps/presignOrderStep.ts        |    3 +-
 src/modules/swap/services/types.ts            |    6 +-
 .../tokens/hooks/useOnchainBalances.ts        |    5 +-
 .../hooks/useExtensibleFallbackContext.ts     |    3 +-
 .../twap/hooks/useFetchTwapOrdersFromSafe.ts  |    3 +-
 .../twap/hooks/useFetchTwapPartOrders.ts      |    2 +-
 .../twap/hooks/useTwapOrderCreationContext.ts |    4 +-
 .../twap/hooks/useTwapOrdersAuthMulticall.ts  |    2 +-
 .../hooks/useTwapOrdersTradeableMulticall.ts  |    2 +-
 .../twap/services/cancelTwapOrderTxs.ts       |    3 +-
 .../twap/services/fetchTwapOrdersFromSafe.ts  |    3 +-
 .../services/getSignatureVerifierContract.ts  |    6 +-
 .../twap/updaters/TwapOrdersUpdater.tsx       |    3 +-
 src/pages/Account/LockedGnoVesting/hooks.ts   |    8 +-
 .../useIsAnySwapAffectedUser.ts               |    5 +-
 tsconfig.base.json                            |    3 +-
 188 files changed, 9666 insertions(+), 21831 deletions(-)
 delete mode 100644 .github/uniswap-original/ISSUE_TEMPLATE/bug-report.md
 delete mode 100644 .github/uniswap-original/ISSUE_TEMPLATE/config.yml
 delete mode 100644 .github/uniswap-original/ISSUE_TEMPLATE/feature-request.md
 delete mode 100644 .github/uniswap-original/actions/setup/action.yml
 delete mode 100644 .github/uniswap-original/bundle.yaml
 delete mode 100644 .github/uniswap-original/workflows/check-pr-title.yaml
 delete mode 100644 .github/uniswap-original/workflows/crowdin-sync.yaml
 delete mode 100644 .github/uniswap-original/workflows/crowdin.yaml
 delete mode 100644 .github/uniswap-original/workflows/integration-tests.yaml
 delete mode 100644 .github/uniswap-original/workflows/lint.yml
 delete mode 100644 .github/uniswap-original/workflows/release.yaml
 delete mode 100644 .github/uniswap-original/workflows/test.yml
 delete mode 100644 .github/uniswap-original/workflows/tests.yaml
 delete mode 100644 .github/uniswap-original/workflows/unit-tests.yaml
 delete mode 100644 scripts/contracts_add_export.js
 delete mode 100644 src/legacy/abis/governor-bravo.json
 delete mode 100644 src/legacy/abis/multicall.json
 delete mode 100644 src/legacy/abis/multicall2.json
 delete mode 100644 src/legacy/abis/types/ArgentWalletContract.d.ts
 delete mode 100644 src/legacy/abis/types/ArgentWalletContract.ts
 delete mode 100644 src/legacy/abis/types/ArgentWalletDetector.d.ts
 delete mode 100644 src/legacy/abis/types/ArgentWalletDetector.ts
 delete mode 100644 src/legacy/abis/types/Eip2612.d.ts
 delete mode 100644 src/legacy/abis/types/Eip_2612.ts
 delete mode 100644 src/legacy/abis/types/EnsPublicResolver.d.ts
 delete mode 100644 src/legacy/abis/types/EnsPublicResolver.ts
 delete mode 100644 src/legacy/abis/types/EnsRegistrar.d.ts
 delete mode 100644 src/legacy/abis/types/EnsRegistrar.ts
 delete mode 100644 src/legacy/abis/types/Erc1155.d.ts
 delete mode 100644 src/legacy/abis/types/Erc1155.ts
 delete mode 100644 src/legacy/abis/types/Erc20.d.ts
 delete mode 100644 src/legacy/abis/types/Erc20.ts
 delete mode 100644 src/legacy/abis/types/Erc20Bytes32.d.ts
 delete mode 100644 src/legacy/abis/types/Erc20_bytes32.ts
 delete mode 100644 src/legacy/abis/types/Erc721.d.ts
 delete mode 100644 src/legacy/abis/types/Erc721.ts
 delete mode 100644 src/legacy/abis/types/GovernorBravo.d.ts
 delete mode 100644 src/legacy/abis/types/GovernorBravo.ts
 delete mode 100644 src/legacy/abis/types/Multicall.d.ts
 delete mode 100644 src/legacy/abis/types/Multicall.ts
 delete mode 100644 src/legacy/abis/types/Multicall2.d.ts
 delete mode 100644 src/legacy/abis/types/Multicall2.ts
 delete mode 100644 src/legacy/abis/types/Unisocks.d.ts
 delete mode 100644 src/legacy/abis/types/Unisocks.ts
 delete mode 100644 src/legacy/abis/types/Weth.d.ts
 delete mode 100644 src/legacy/abis/types/Weth.ts
 delete mode 100644 src/legacy/abis/types/common.d.ts
 delete mode 100644 src/legacy/abis/types/common.ts
 delete mode 100644 src/legacy/abis/types/factories/ArgentWalletContract__factory.ts
 delete mode 100644 src/legacy/abis/types/factories/ArgentWalletDetector__factory.ts
 delete mode 100644 src/legacy/abis/types/factories/Eip2612__factory.ts
 delete mode 100644 src/legacy/abis/types/factories/Eip_2612__factory.ts
 delete mode 100644 src/legacy/abis/types/factories/EnsPublicResolver__factory.ts
 delete mode 100644 src/legacy/abis/types/factories/EnsRegistrar__factory.ts
 delete mode 100644 src/legacy/abis/types/factories/Erc1155__factory.ts
 delete mode 100644 src/legacy/abis/types/factories/Erc20Bytes32__factory.ts
 delete mode 100644 src/legacy/abis/types/factories/Erc20__factory.ts
 delete mode 100644 src/legacy/abis/types/factories/Erc20_bytes32__factory.ts
 delete mode 100644 src/legacy/abis/types/factories/Erc721__factory.ts
 delete mode 100644 src/legacy/abis/types/factories/GovernorBravo__factory.ts
 delete mode 100644 src/legacy/abis/types/factories/Multicall2__factory.ts
 delete mode 100644 src/legacy/abis/types/factories/Multicall__factory.ts
 delete mode 100644 src/legacy/abis/types/factories/Unisocks__factory.ts
 delete mode 100644 src/legacy/abis/types/factories/Weth__factory.ts
 delete mode 100644 src/legacy/abis/types/factories/index.ts
 delete mode 100644 src/legacy/abis/types/index.ts
 delete mode 100644 src/legacy/abis/unisocks.json
 create mode 100644 src/libs/abis/.eslintrc.json
 create mode 100644 src/libs/abis/README.md
 create mode 100644 src/libs/abis/jest.config.ts
 create mode 100644 src/libs/abis/package.json
 create mode 100644 src/libs/abis/project.json
 create mode 100644 src/libs/abis/src/abis-legacy/UniswapInterfaceMulticall.json
 rename src/{legacy/abis => libs/abis/src/abis-legacy}/argent-wallet-contract.json (100%)
 rename src/{legacy/abis => libs/abis/src/abis-legacy}/argent-wallet-detector.json (100%)
 rename src/{legacy/abis => libs/abis/src/abis-legacy}/eip_2612.json (100%)
 rename src/{legacy/abis => libs/abis/src/abis-legacy}/ens-public-resolver.json (100%)
 rename src/{legacy/abis => libs/abis/src/abis-legacy}/ens-registrar.json (100%)
 rename src/{legacy/abis => libs/abis/src/abis-legacy}/erc1155.json (100%)
 rename src/{legacy/abis => libs/abis/src/abis-legacy}/erc20.json (100%)
 rename src/{legacy/abis => libs/abis/src/abis-legacy}/erc20_bytes32.json (100%)
 rename src/{legacy/abis => libs/abis/src/abis-legacy}/erc721.json (100%)
 rename src/{legacy/abis => libs/abis/src/abis-legacy}/weth.json (100%)
 rename src/{ => libs/abis/src}/abis/ComposableCoW.json (100%)
 rename src/{ => libs/abis/src}/abis/ExtensibleFallbackHandler.json (100%)
 rename src/{ => libs/abis/src}/abis/GPv2Settlement.json (100%)
 rename src/{ => libs/abis/src}/abis/MerkleDrop.json (100%)
 rename src/{ => libs/abis/src}/abis/SignatureVerifierMuxer.json (100%)
 rename src/{ => libs/abis/src}/abis/TokenDistro.json (100%)
 rename src/{ => libs/abis/src}/abis/vCow.json (100%)
 create mode 100644 src/libs/abis/src/generated/custom/ComposableCoW.ts
 create mode 100644 src/libs/abis/src/generated/custom/ExtensibleFallbackHandler.ts
 create mode 100644 src/libs/abis/src/generated/custom/GPv2Settlement.ts
 create mode 100644 src/libs/abis/src/generated/custom/MerkleDrop.ts
 create mode 100644 src/libs/abis/src/generated/custom/SignatureVerifierMuxer.ts
 create mode 100644 src/libs/abis/src/generated/custom/TokenDistro.ts
 create mode 100644 src/libs/abis/src/generated/custom/VCow.ts
 create mode 100644 src/libs/abis/src/generated/custom/common.ts
 create mode 100644 src/libs/abis/src/generated/custom/factories/ComposableCoW__factory.ts
 create mode 100644 src/libs/abis/src/generated/custom/factories/ExtensibleFallbackHandler__factory.ts
 create mode 100644 src/libs/abis/src/generated/custom/factories/GPv2Settlement__factory.ts
 create mode 100644 src/libs/abis/src/generated/custom/factories/MerkleDrop__factory.ts
 create mode 100644 src/libs/abis/src/generated/custom/factories/SignatureVerifierMuxer__factory.ts
 create mode 100644 src/libs/abis/src/generated/custom/factories/TokenDistro__factory.ts
 create mode 100644 src/libs/abis/src/generated/custom/factories/VCow__factory.ts
 create mode 100644 src/libs/abis/src/generated/custom/factories/index.ts
 create mode 100644 src/libs/abis/src/generated/custom/index.ts
 create mode 100644 src/libs/abis/src/generated/ethflow/CoWSwapEthFlow.ts
 create mode 100644 src/libs/abis/src/generated/ethflow/common.ts
 create mode 100644 src/libs/abis/src/generated/ethflow/factories/CoWSwapEthFlow__factory.ts
 create mode 100644 src/libs/abis/src/generated/ethflow/factories/index.ts
 create mode 100644 src/libs/abis/src/generated/ethflow/index.ts
 create mode 100644 src/libs/abis/src/generated/legacy/ArgentWalletContract.ts
 create mode 100644 src/libs/abis/src/generated/legacy/ArgentWalletDetector.ts
 create mode 100644 src/libs/abis/src/generated/legacy/Eip_2612.ts
 create mode 100644 src/libs/abis/src/generated/legacy/EnsPublicResolver.ts
 create mode 100644 src/libs/abis/src/generated/legacy/EnsRegistrar.ts
 create mode 100644 src/libs/abis/src/generated/legacy/Erc1155.ts
 create mode 100644 src/libs/abis/src/generated/legacy/Erc20.ts
 create mode 100644 src/libs/abis/src/generated/legacy/Erc20_bytes32.ts
 create mode 100644 src/libs/abis/src/generated/legacy/Erc721.ts
 create mode 100644 src/libs/abis/src/generated/legacy/UniswapInterfaceMulticall.ts
 create mode 100644 src/libs/abis/src/generated/legacy/Weth.ts
 create mode 100644 src/libs/abis/src/generated/legacy/common.ts
 create mode 100644 src/libs/abis/src/generated/legacy/factories/ArgentWalletContract__factory.ts
 create mode 100644 src/libs/abis/src/generated/legacy/factories/ArgentWalletDetector__factory.ts
 create mode 100644 src/libs/abis/src/generated/legacy/factories/Eip_2612__factory.ts
 create mode 100644 src/libs/abis/src/generated/legacy/factories/EnsPublicResolver__factory.ts
 create mode 100644 src/libs/abis/src/generated/legacy/factories/EnsRegistrar__factory.ts
 create mode 100644 src/libs/abis/src/generated/legacy/factories/Erc1155__factory.ts
 create mode 100644 src/libs/abis/src/generated/legacy/factories/Erc20__factory.ts
 create mode 100644 src/libs/abis/src/generated/legacy/factories/Erc20_bytes32__factory.ts
 create mode 100644 src/libs/abis/src/generated/legacy/factories/Erc721__factory.ts
 create mode 100644 src/libs/abis/src/generated/legacy/factories/UniswapInterfaceMulticall__factory.ts
 create mode 100644 src/libs/abis/src/generated/legacy/factories/Weth__factory.ts
 create mode 100644 src/libs/abis/src/generated/legacy/factories/index.ts
 create mode 100644 src/libs/abis/src/generated/legacy/index.ts
 create mode 100644 src/libs/abis/src/index.ts
 create mode 100644 src/libs/abis/tsconfig.json
 create mode 100644 src/libs/abis/tsconfig.lib.json
 create mode 100644 src/libs/abis/tsconfig.spec.json
 create mode 100644 src/libs/abis/vite.config.ts
 create mode 100644 src/libs/abis/yarn.lock

diff --git a/.eslintrc.json b/.eslintrc.json
index 1c55453ac6..c17c354c5a 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -1,6 +1,7 @@
 {
   "extends": ["react-app", "react-app/jest", "plugin:cypress/recommended"],
   "plugins": ["unused-imports"],
+  "ignorePatterns": ["node_modules/", "dist/", "build", "coverage", "./", "cypress/", "src/libs/abis/src/generated"],
   "rules": {
     "no-restricted-imports": [
       "error",
diff --git a/.github/uniswap-original/ISSUE_TEMPLATE/bug-report.md b/.github/uniswap-original/ISSUE_TEMPLATE/bug-report.md
deleted file mode 100644
index f4b5bf03ef..0000000000
--- a/.github/uniswap-original/ISSUE_TEMPLATE/bug-report.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-name: Bug Report
-about: Describe an issue in the Uniswap Interface
-title: ''
-labels: bug
-assignees: ''
----
-
-**Bug Description**
-A clear and concise description of the bug.
-
-**Steps to Reproduce**
-
-1. Go to ...
-2. Click on ...
-   ...
-
-**Expected Behavior**
-A clear and concise description of what you expected to happen.
-
-**Additional Context**
-Add any other context about the problem here (screenshots, whether the bug only occurs only in certain mobile/desktop/browser environments, etc.)
diff --git a/.github/uniswap-original/ISSUE_TEMPLATE/config.yml b/.github/uniswap-original/ISSUE_TEMPLATE/config.yml
deleted file mode 100644
index 69e1a068c5..0000000000
--- a/.github/uniswap-original/ISSUE_TEMPLATE/config.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-blank_issues_enabled: true
-contact_links:
-  - name: Support
-    url: https://discord.gg/FCfyBSbCU5
-    about: Please ask and answer questions here
-  - name: List a token
-    url: https://github.com/Uniswap/default-token-list#adding-a-token
-    about: Any requests to add a token to Uniswap should go here
diff --git a/.github/uniswap-original/ISSUE_TEMPLATE/feature-request.md b/.github/uniswap-original/ISSUE_TEMPLATE/feature-request.md
deleted file mode 100644
index d6eda87030..0000000000
--- a/.github/uniswap-original/ISSUE_TEMPLATE/feature-request.md
+++ /dev/null
@@ -1,19 +0,0 @@
----
-name: Feature Request
-about: Suggest an idea for improving the UX of the Uniswap Interface
-title: ''
-labels: 'improvement'
-assignees: ''
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.
diff --git a/.github/uniswap-original/actions/setup/action.yml b/.github/uniswap-original/actions/setup/action.yml
deleted file mode 100644
index 8845fb16bd..0000000000
--- a/.github/uniswap-original/actions/setup/action.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-name: Setup
-runs:
-  using: composite
-  steps:
-    - uses: actions/checkout@v3
-
-    - uses: actions/setup-node@v3
-      with:
-        node-version: 14
-        registry-url: https://registry.npmjs.org
-        cache: yarn
-
-    - uses: actions/cache@v3
-      id: install-cache
-      with:
-        path: node_modules/
-        key: ${{ runner.os }}-install-${{ hashFiles('**/yarn.lock') }}
-
-    - if: steps.install-cache.outputs.cache-hit != 'true'
-      run: yarn install --frozen-lockfile --ignore-scripts
-      shell: bash
diff --git a/.github/uniswap-original/bundle.yaml b/.github/uniswap-original/bundle.yaml
deleted file mode 100644
index 1f99c34841..0000000000
--- a/.github/uniswap-original/bundle.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-name: Widgets
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-    branches:
-      - main
-
-jobs:
-  build:
-    name: Build
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Set up node
-        uses: actions/setup-node@v2
-        with:
-          node-version: 14
-          registry-url: https://registry.npmjs.org
-
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-
-      - uses: actions/cache@v2
-        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
-        with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
-
-      - name: Install dependencies
-        run: yarn install --frozen-lockfile
-
-      - name: Build
-        run: yarn widgets:build
\ No newline at end of file
diff --git a/.github/uniswap-original/workflows/check-pr-title.yaml b/.github/uniswap-original/workflows/check-pr-title.yaml
deleted file mode 100644
index f2907eca4f..0000000000
--- a/.github/uniswap-original/workflows/check-pr-title.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-name: Check PR Title
-
-on:
-  pull_request_target:
-    types:
-      - opened
-      - edited
-      - synchronize
-
-jobs:
-  # Ensures that the PR title adheres to [conventional commits](https://www.conventionalcommits.org/en/v1.0.0/).
-  conventional-commit:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: amannn/action-semantic-pull-request@v3.4.0
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/uniswap-original/workflows/crowdin-sync.yaml b/.github/uniswap-original/workflows/crowdin-sync.yaml
deleted file mode 100644
index 91b419b98a..0000000000
--- a/.github/uniswap-original/workflows/crowdin-sync.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-name: Crowdin Download
-
-on:
-  schedule:
-    # Download translations every hour.
-    # This is not done as part of the build so that builds remain reproducible.
-    - cron: '0 * * * *'
-  # manual trigger
-  workflow_dispatch:
-
-jobs:
-  download-translations:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: ./.github/actions/setup
-      - run: yarn i18n:extract
-
-      - name: Download Crowdin translations
-        uses: crowdin/github-action@1.4.9
-        with:
-          upload_sources: false
-          download_translations: true
-          project_id: 458284
-          token: ${{ secrets.CROWDIN_PERSONAL_TOKEN_SECRET }}
-          source: 'src/locales/en-US.po'
-          translation: 'src/locales/%locale%.po'
-          create_pull_request: true
-          pull_request_title: 'chore(i18n): new Crowdin translations'
-          localization_branch_name: l10n_crowdin
-          commit_message: 'chore(i18n): synchronize translations from crowdin [skip ci]'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/uniswap-original/workflows/crowdin.yaml b/.github/uniswap-original/workflows/crowdin.yaml
deleted file mode 100644
index 4766364a8e..0000000000
--- a/.github/uniswap-original/workflows/crowdin.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-name: Crowdin Upload
-
-on:
-  push:
-    branches:
-      - main
-
-jobs:
-  upload-sources:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: ./.github/actions/setup
-      - run: yarn i18n:extract
-
-      - name: Upload Crowdin sources
-        uses: crowdin/github-action@1.1.0
-        with:
-          upload_sources: true
-          download_translations: false
-          project_id: 458284
-          token: ${{ secrets.CROWDIN_PERSONAL_TOKEN_SECRET }}
-          source: 'src/locales/en-US.po'
-          translation: 'src/locales/%locale%.po'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/uniswap-original/workflows/integration-tests.yaml b/.github/uniswap-original/workflows/integration-tests.yaml
deleted file mode 100644
index 625af36bc3..0000000000
--- a/.github/uniswap-original/workflows/integration-tests.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
-name: Integration Tests
-
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-    branches:
-      - main
-
-jobs:
-  integration-tests:
-    name: Cypress
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Set up node
-        uses: actions/setup-node@v2
-        with:
-          node-version: 14
-          registry-url: https://registry.npmjs.org
-
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-
-      - uses: actions/cache@v2
-        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
-        with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
-
-      - name: Install dependencies
-        run: yarn install --frozen-lockfile
-
-      - run: yarn cypress install
-
-      - run: yarn build
-        env:
-          CI: false
-          REACT_APP_NETWORK_URL: 'https://mainnet.infura.io/v3/4bf032f2d38a4ed6bb975b80d6340847'
-          REACT_APP_SERVICE_WORKER: false
-
-      - run: yarn e2e
-        env:
-          CYPRESS_INTEGRATION_TEST_PRIVATE_KEY: ${{ secrets.CYPRESS_INTEGRATION_TEST_PRIVATE_KEY }}
-          CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
diff --git a/.github/uniswap-original/workflows/lint.yml b/.github/uniswap-original/workflows/lint.yml
deleted file mode 100644
index 930da1f53c..0000000000
--- a/.github/uniswap-original/workflows/lint.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-name: Lint
-
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-    branches:
-      - main
-
-jobs:
-  run-linters:
-    name: Run linters
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Set up node
-        uses: actions/setup-node@v2
-        with:
-          node-version: 14
-          registry-url: https://registry.npmjs.org
-
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-
-      - uses: actions/cache@v2
-        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
-        with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
-      - name: Install dependencies
-        run: yarn install --frozen-lockfile
-
-      - name: Run eslint w/ autofix
-        if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.owner.login == github.repository_owner }}
-        uses: wearerequired/lint-action@36c7e6689e80d785d27a22f71d970f3a3b4fcb70
-        with:
-          github_token: ${{ secrets.github_token }}
-          eslint: true
-          eslint_args: "-c .eslintrc.json"
-          auto_fix: true
-
-      - name: Run eslint
-        if: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.repo.owner.login != github.repository_owner }}
-        run: yarn eslint .
\ No newline at end of file
diff --git a/.github/uniswap-original/workflows/release.yaml b/.github/uniswap-original/workflows/release.yaml
deleted file mode 100644
index 693b49ad15..0000000000
--- a/.github/uniswap-original/workflows/release.yaml
+++ /dev/null
@@ -1,122 +0,0 @@
-name: Release
-on:
-  schedule:
-    - cron: '0 12 * * 1-4' # every day 12:00 UTC Monday-Thursday
-  # manual trigger
-  workflow_dispatch:
-
-jobs:
-  wait-on-tests:
-    runs-on: ubuntu-latest
-    steps:
-      - id: unit-tests
-        uses: fountainhead/action-wait-for-check@v1.0.0
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          checkName: unit-tests
-      - id: cypress-tests
-        uses: fountainhead/action-wait-for-check@v1.0.0
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          checkName: cypress-tests
-      - if: steps.unit-tests.outputs.conclusion != 'success' || steps.cypress-tests.outputs.conclusion != 'success'
-        run: exit 1
-
-  tag:
-    needs: wait-on-tests
-    runs-on: ubuntu-latest
-    outputs:
-      new_tag: ${{ steps.github-tag-action.outputs.new_tag }}
-      changelog: ${{ steps.github-tag-action.outputs.changelog }}
-    steps:
-      - uses: actions/checkout@v3
-      - name: Bump and tag
-        id: github-tag-action
-        uses: mathieudutour/github-tag-action@v6.0
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          release_branches: .*
-          default_bump: patch
-
-  release:
-    needs: tag
-    if: ${{ needs.tag.outputs.new_tag != null }}
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: ./.github/actions/setup
-      - run: yarn prepare
-      - run: yarn build
-
-      - name: Pin to IPFS
-        id: pinata
-        uses: anantaramdas/ipfs-pinata-deploy-action@39bbda1ce1fe24c69c6f57861b8038278d53688d
-        with:
-          pin-name: Uniswap ${{ needs.tag.outputs.new_tag }}
-          path: './build'
-          pinata-api-key: ${{ secrets.PINATA_API_KEY }}
-          pinata-secret-api-key: ${{ secrets.PINATA_API_SECRET_KEY }}
-
-      - name: Pin to Crust
-        uses: crustio/ipfs-crust-action@v1.0.8
-        continue-on-error: true
-        timeout-minutes: 2
-        with:
-          cid: ${{ steps.upload.outputs.hash }}
-          seeds: ${{ secrets.CRUST_SEEDS }}
-
-      - name: Convert CIDv0 to CIDv1
-        id: convert-cidv0
-        uses: uniswap/convert-cidv0-cidv1@v1.0.0
-        with:
-          cidv0: ${{ steps.pinata.outputs.hash }}
-
-      - uses: actions/cache@v3
-        id: cypress-cache
-        with:
-          path: /home/runner/.cache/Cypress
-          key: ${{ runner.os }}-cypress-${{ hashFiles('node_modules/cypress') }}
-      - if: steps.cypress-cache.outputs.cache-hit != 'true'
-        run: yarn cypress install
-      - uses: cypress-io/github-action@v4
-        with:
-          install: false
-          browser: chrome
-          config-file: cypress.release.config.ts
-          config: baseUrl=https://cloudflare-ipfs.com/ipfs/${{ steps.pinata.outputs.hash }}
-
-      - name: Update DNS with new IPFS hash
-        env:
-          CLOUDFLARE_TOKEN: ${{ secrets.CLOUDFLARE_TOKEN }}
-          RECORD_DOMAIN: 'uniswap.org'
-          RECORD_NAME: '_dnslink.app'
-          CLOUDFLARE_ZONE_ID: ${{ secrets.CLOUDFLARE_ZONE_ID }}
-        uses: textileio/cloudflare-update-dnslink@0fe7b7a1ffc865db3a4da9773f0f987447ad5848
-        with:
-          cid: ${{ steps.pinata.outputs.hash }}
-
-      - name: Release
-        uses: actions/create-release@v1.1.0
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag_name: ${{ needs.tag.outputs.new_tag }}
-          release_name: Release ${{ needs.tag.outputs.new_tag }}
-          body: |
-            IPFS hash of the deployment:
-            - CIDv0: `${{ steps.pinata.outputs.hash }}`
-            - CIDv1: `${{ steps.convert-cidv0.outputs.cidv1 }}`
-
-            The latest release is always accessible via our alias to the Cloudflare IPFS gateway at [app.uniswap.org](https://app.uniswap.org).
-
-            You can also access the Uniswap Interface directly from an IPFS gateway.
-            **BEWARE**: The Uniswap interface uses [`localStorage`](https://developer.mozilla.org/en-US/docs/Web/API/Window/localStorage) to remember your settings, such as which tokens you have imported.
-            **You should always use an IPFS gateway that enforces origin separation**, or our alias to the latest release at [app.uniswap.org](https://app.uniswap.org).
-            Your Uniswap settings are never remembered across different URLs.
-
-            IPFS gateways:
-            - https://${{ steps.convert-cidv0.outputs.cidv1 }}.ipfs.dweb.link/
-            - https://${{ steps.convert-cidv0.outputs.cidv1 }}.ipfs.cf-ipfs.com/
-            - [ipfs://${{ steps.upload.outputs.hash }}/](ipfs://${{ steps.pinata.outputs.hash }}/)
-
-            ${{ needs.tag.outputs.changelog }}
diff --git a/.github/uniswap-original/workflows/test.yml b/.github/uniswap-original/workflows/test.yml
deleted file mode 100644
index 7c5318c7f0..0000000000
--- a/.github/uniswap-original/workflows/test.yml
+++ /dev/null
@@ -1,103 +0,0 @@
-name: Test
-
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-    branches:
-      - main
-  # manual trigger
-  workflow_dispatch:
-
-jobs:
-  lint:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: ./.github/actions/setup
-      - run: yarn lint
-
-  deps-tests:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: ./.github/actions/setup
-      # Test that deps satisfy both "fewer" and "highest" strategies. This is to ensure we are
-      # up-to-date ("highest") while avoiding increasing package size ("fewer").
-      # These are readonly (--list) and explicitly exclude packages which only satisfy one strategy.
-      - run: npx yarn-deduplicate --strategy=fewer --list --fail --exclude commander safe-buffer
-      - run: npx yarn-deduplicate --strategy=highest --list --fail --exclude commander safe-buffer
-
-  unit-tests:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: ./.github/actions/setup
-      - run: yarn prepare
-      - run: yarn test
-
-  cypress-build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: ./.github/actions/setup
-      - run: yarn prepare
-
-      - run: yarn build
-      - uses: actions/upload-artifact@v2
-        with:
-          name: build
-          path: build
-          if-no-files-found: error
-
-      - uses: actions/cache@v3
-        id: cypress-cache
-        with:
-          path: /home/runner/.cache/Cypress
-          key: ${{ runner.os }}-cypress-${{ hashFiles('node_modules/cypress') }}
-      - if: steps.cypress-cache.outputs.cache-hit != 'true'
-        run: yarn cypress install
-
-  cypress-test-matrix:
-    needs: cypress-build
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        containers: [1, 2, 3, 4]
-    steps:
-      - uses: actions/checkout@v3
-      - uses: ./.github/actions/setup
-
-      - uses: actions/download-artifact@v2
-        with:
-          name: build
-          path: build
-
-      - uses: actions/cache@v3
-        id: cypress-cache
-        with:
-          path: /home/runner/.cache/Cypress
-          key: ${{ runner.os }}-cypress-${{ hashFiles('node_modules/cypress') }}
-      - if: steps.cypress-cache.outputs.cache-hit != 'true'
-        run: yarn cypress install
-
-      - uses: cypress-io/github-action@v4
-        with:
-          install: false
-          start: yarn serve
-          wait-on: 'http://localhost:3000'
-          browser: chrome
-          record: true
-          parallel: true
-        env:
-          CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-  # Included as a single job to check against for cypress test success, as cypress runs in a matrix.
-  cypress-tests:
-    needs: cypress-test-matrix
-    runs-on: ubuntu-latest
-    steps:
-      - run: echo 'Finished cypress tests https\://dashboard.cypress.io/projects/yp82ef'
diff --git a/.github/uniswap-original/workflows/tests.yaml b/.github/uniswap-original/workflows/tests.yaml
deleted file mode 100644
index 2170ddaa57..0000000000
--- a/.github/uniswap-original/workflows/tests.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
-name: Tests
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-    branches:
-      - main
-
-jobs:
-  integration-tests:
-    name: Integration tests
-    runs-on: ubuntu-16.04
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v1
-      - uses: actions/setup-node@v1
-        with:
-          node-version: '12'
-          always-auth: true
-          registry-url: https://registry.npmjs.org
-
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-      - uses: actions/cache@v1
-        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
-        with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
-      - run: yarn install --frozen-lockfile
-      - run: yarn cypress install
-      - run: yarn build
-        env:
-          CI: false
-          REACT_APP_NETWORK_URL: 'https://mainnet.infura.io/v3/586e7e6b7c7e437aa41f5da496a749f5'
-      - run: yarn e2e
-
-  unit-tests:
-    name: Unit tests
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v1
-      - uses: actions/setup-node@v1
-        with:
-          node-version: '12'
-          always-auth: true
-          registry-url: https://registry.npmjs.org
-
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-      - uses: actions/cache@v1
-        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
-        with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
-      - run: yarn install --frozen-lockfile
-      - run: yarn test
diff --git a/.github/uniswap-original/workflows/unit-tests.yaml b/.github/uniswap-original/workflows/unit-tests.yaml
deleted file mode 100644
index a0dbfa63c8..0000000000
--- a/.github/uniswap-original/workflows/unit-tests.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-name: Unit Tests
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-    branches:
-      - main
-
-jobs:
-  unit-tests:
-    name: Unit tests
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Set up node
-        uses: actions/setup-node@v2
-        with:
-          node-version: 14
-          registry-url: https://registry.npmjs.org
-
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-
-      - uses: actions/cache@v2
-        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
-        with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
-
-      - name: Install dependencies
-        run: yarn install --frozen-lockfile
-
-      - name: Run unit tests
-        run: yarn test
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4170bc5847..b5691118db 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -53,8 +53,6 @@ jobs:
         uses: actions/cache@v3
         with:
           path: |
-            src/types/v3
-            src/abis/types
             src/state/data
             src/locales
           key: ${{ runner.os }}-generatedFiles-${{ hashFiles('**/yarn.lock') }}
@@ -88,8 +86,6 @@ jobs:
         uses: actions/cache@v3
         with:
           path: |
-            src/types/v3
-            src/abis/types
             src/state/data
             src/locales
           key: ${{ runner.os }}-generatedFiles-${{ hashFiles('**/yarn.lock') }}
@@ -97,6 +93,7 @@ jobs:
       - name: Unit Test
         run: yarn test
 
+
       # - name: Coveralls
       #   uses: coverallsapp/github-action@v1.1.2
       #   with:
@@ -131,9 +128,8 @@ jobs:
         uses: actions/cache@v3
         with:
           path: |
-            src/types/v3
-            src/abis/types
             src/state/data
+            src/locales
           key: ${{ runner.os }}-generatedFiles-${{ hashFiles('**/yarn.lock') }}
 
       - name: Run linters
@@ -145,6 +141,7 @@ jobs:
           auto_fix: ${{ github.event_name == 'pull_request' }}
           prettier: true
 
+
       - name: Run eslint
         if: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.repo.owner.login != github.repository_owner }}
         run: yarn eslint .
diff --git a/.gitignore b/.gitignore
index e65bba5e32..23b7c13c93 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,6 @@
 # See https://help.github.com/ignore-files/ for more about ignoring files.
 
 # generated contract types
-/src/legacy/types/v3
-/src/types/v3
-/src/abis/types
 /src/lib/locales/**/*.js
 /src/lib/locales/**/en-US.po
 /src/lib/locales/**/pseudo.po
@@ -14,7 +11,7 @@
 /src/locales/**/pseudo.po
 
 # dependencies
-/node_modules
+node_modules
 
 # testing
 /coverage
diff --git a/README.md b/README.md
index f26b7b4b4e..25a546e59d 100644
--- a/README.md
+++ b/README.md
@@ -195,3 +195,4 @@ The plan:
 
 1. [Oveall Architecture](docs/architecture-overview.md)
 2. [Amounts formatting](src/utils/amountFormat/README.md)
+3. [ABIs](src/libs/abis/README.md)
diff --git a/craco.config.js b/craco.config.js
index bf02ad9e6f..6669acc1f3 100644
--- a/craco.config.js
+++ b/craco.config.js
@@ -1,11 +1,13 @@
 const SentryWebpackPlugin = require('@sentry/webpack-plugin')
 const CracoWorkboxPlugin = require('craco-workbox')
+const { pathsToModuleNameMapper } = require('ts-jest')
 const webpack = require('webpack')
 const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin
 
 const path = require('path')
 
 const { version } = require('./package.json')
+const { compilerOptions } = require('./tsconfig.base.json')
 
 // see https://github.com/gsoft-inc/craco/blob/master/packages/craco/README.md#configuration-overview
 
@@ -64,6 +66,7 @@ module.exports = {
       '@cowprotocol/ui-utils': path.resolve(__dirname, 'src/libs/ui-utils/src/index.ts'),
       '@cowprotocol/widget-lib': path.resolve(__dirname, 'src/libs/widget-lib/src/index.ts'),
       '@cowprotocol/widget-react': path.resolve(__dirname, 'src/libs/widget-react/src/index.ts'),
+      '@cowprotocol/abis': path.resolve(__dirname, 'src/libs/abis/src/index.ts'),
     },
     // https://webpack.js.org/configuration
     configure: (webpackConfig) => ({
@@ -103,4 +106,10 @@ module.exports = {
 
     return config
   },
+  jest: {
+    configure: {
+      preset: 'ts-jest',
+      moduleNameMapper: pathsToModuleNameMapper(compilerOptions.paths, { prefix: '<rootDir>/src/' }),
+    },
+  },
 }
diff --git a/nx.json b/nx.json
index c7a5ef90a6..85a6727f0b 100644
--- a/nx.json
+++ b/nx.json
@@ -34,7 +34,7 @@
           "contracts:compile",
           "optimize-bundle",
           "i18n:extract",
-          "i18n:compile",
+          "i18n",
           "i18n:pseudo",
           "cosmos:export",
           "sitemap",
diff --git a/package.json b/package.json
index 7de4bb8f2e..aa328378bf 100644
--- a/package.json
+++ b/package.json
@@ -13,6 +13,7 @@
     "e2e": "nx run-many -t e2e",
     "start:ssl": "nx exec -- HTTPS=true yarn start",
     "start:service-worker": "nx exec -- yarn _start:service-worker ",
+    "lint": "nx exec -- yarn run eslint ./",
     "lint:fix": "nx exec -- yarn run eslint --fix ./",
     "mock": "nx exec -- REACT_APP_MOCK=true yarn start",
     "build:analyze": "nx exec -- cross-env REACT_APP_ANALYZE_BUNDLE=true yarn build",
@@ -23,19 +24,13 @@
     "serve": "nx exec -- serve build -l 3000",
     "serve:ci": "nx exec -- serve website -l 3000",
     "cypress": "nx exec -- cypress open",
-    "contracts:add:export": "nx exec -- node ./scripts/contracts_add_export.js",
-    "contracts:compile:abi": "nx exec -- typechain --target ethers-v5 --out-dir src/abis/types './src/abis/**/*.json'",
-    "contracts:compile:abi-ethflow": "nx exec -- typechain --target ethers-v5 --out-dir src/abis/types/ethflow \"./node_modules/@cowprotocol/ethflowcontract/artifacts/CoWSwapEthFlow.sol/*.json\"",
-    "contracts:compile:abi-uniswap": "nx exec -- typechain --target ethers-v5 --out-dir src/legacy/abis/types \"./src/legacy/abis/**/*.json\"",
-    "contracts:compile:v3": "nx exec -- typechain --target ethers-v5 --out-dir src/legacy/types/v3 \"./node_modules/@uniswap/**/artifacts/contracts/**/*[!dbg].json\"",
-    "contracts:compile": "nx exec -- yarn _contracts:compile ",
-    "prei18n:extract": "touch src/locales/en-US.po",
     "optimize-bundle": "nx exec -- node ./scripts/fix-ethereumjs-bundle.js",
     "patch-package": "nx exec -- patch-package",
-    "i18n:extract": "nx exec -- cross-env NODE_ENV=development lingui extract --locale en-US",
-    "i18n:compile": "nx exec -- yarn _i18n:compile ",
-    "i18n:pseudo": "nx exec -- yarn _i18n:pseudo ",
-    "postinstall": "yarn contracts:compile && yarn i18n:compile && yarn patch-package",
+    "i18n": "nx exec -- yarn i18n:compile",
+    "i18n:compile": "yarn i18n:extract && lingui compile",
+    "i18n:extract": "cross-env NODE_ENV=development lingui extract --locale en-US",
+    "i18n:pseudo": "lingui extract --locale pseudo && lingui compile",
+    "postinstall": "yarn i18n && yarn patch-package",
     "prepare": "husky install",
     "prepublishOnly": "yarn widgets:build",
     "cosmos:clear": "nx exec -- rm -rf ./public/cosmos",
@@ -45,9 +40,6 @@
     "sitemap": "nx exec -- node src/sitemap",
     "writeVersion": "nx exec -- node src/writeVersion",
     "_start:service-worker": "yarn build && yarn serve",
-    "_contracts:compile": "yarn contracts:compile:abi && yarn contracts:compile:abi-ethflow && yarn contracts:add:export && yarn contracts:compile:abi-uniswap && yarn contracts:compile:v3",
-    "_i18n:compile": "yarn i18n:extract && lingui compile",
-    "_i18n:pseudo": "lingui extract --locale pseudo && lingui compile",
     "_cosmos:run": "yarn cosmos:clear && cosmos"
   },
   "browser": {
@@ -306,37 +298,12 @@
           "{projectRoot}/../node_modules/@ethereumjs/common/dist.browser/genesisStates/mainnet.json"
         ]
       },
-      "contracts:add:export": {
-        "outputs": [
-          "{projectRoot}/src/abis/types/index.ts"
-        ]
-      },
-      "contracts:compile:abi": {
-        "outputs": [
-          "{projectRoot}/src/abis/types"
-        ]
-      },
-      "contracts:compile:abi-ethflow": {
-        "outputs": [
-          "{projectRoot}/src/abis/types/ethflow"
-        ]
-      },
-      "contracts:compile:abi-uniswap": {
-        "outputs": [
-          "{projectRoot}/src/legacy/abis/types"
-        ]
-      },
-      "contracts:compile:v3": {
-        "outputs": [
-          "{projectRoot}/src/legacy/types/v3"
-        ]
-      },
       "i18n:extract": {
         "outputs": [
           "{projectRoot}/src/locales"
         ]
       },
-      "i18n:compile": {
+      "i18n": {
         "outputs": [
           "{projectRoot}/src/locales"
         ]
diff --git a/project.json b/project.json
index 8bf23e6375..fb5f4a6073 100644
--- a/project.json
+++ b/project.json
@@ -11,7 +11,7 @@
     "build": {
       "executor": "nx:run-commands",
       "options": {
-        "command": "yarn i18n:compile && craco build && yarn writeVersion"
+        "command": "yarn i18n && craco build && yarn writeVersion"
       }
     },
     "e2e": {
diff --git a/scripts/contracts_add_export.js b/scripts/contracts_add_export.js
deleted file mode 100644
index 4d984558a9..0000000000
--- a/scripts/contracts_add_export.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/* eslint-disable @typescript-eslint/no-var-requires */
-/* This script adds necessary export of Uniswap abis/types
-   to the end of auto-generated abis/types/index.ts file */
-const fs = require('fs')
-const path = require('path')
-
-const fileTypesIndex = path.resolve(__dirname, '../src/abis/types/index.ts')
-const outputBaseAbis = 'export * from "legacy/abis/types";\n'
-const outputEthFlowAbis = 'export * from "abis/types/ethflow";\n'
-
-fs.appendFile(fileTypesIndex, outputBaseAbis, function (err) {
-  if (err) {
-    throw err
-  }
-
-  console.log('Successfully added contracts export script targetting abis/types/index.ts!')
-})
-
-fs.appendFile(fileTypesIndex, outputEthFlowAbis, function (err) {
-  if (err) {
-    throw err
-  }
-
-  console.log('Successfully added contracts export script targetting ethflow contracts!')
-})
diff --git a/src/common/hooks/useApproveCallback.ts b/src/common/hooks/useApproveCallback.ts
index 21d9fd790e..4d5d51247e 100644
--- a/src/common/hooks/useApproveCallback.ts
+++ b/src/common/hooks/useApproveCallback.ts
@@ -1,11 +1,11 @@
 import { useCallback } from 'react'
 
+import { Erc20 } from '@cowprotocol/abis'
 import { BigNumber } from '@ethersproject/bignumber'
 import { MaxUint256 } from '@ethersproject/constants'
 import { TransactionResponse } from '@ethersproject/providers'
 import { Currency, CurrencyAmount } from '@uniswap/sdk-core'
 
-import { Erc20 } from 'legacy/abis/types'
 import { APPROVE_GAS_LIMIT_DEFAULT } from 'legacy/hooks/useApproveCallback/useApproveCallbackMod'
 import { useTokenContract } from 'legacy/hooks/useContract'
 import { useTransactionAdder } from 'legacy/state/enhancedTransactions/hooks'
diff --git a/src/common/hooks/useCancelOrder/onChainCancellation.ts b/src/common/hooks/useCancelOrder/onChainCancellation.ts
index e888b78fc8..71dc9b7a67 100644
--- a/src/common/hooks/useCancelOrder/onChainCancellation.ts
+++ b/src/common/hooks/useCancelOrder/onChainCancellation.ts
@@ -1,3 +1,4 @@
+import { GPv2Settlement, CoWSwapEthFlow } from '@cowprotocol/abis'
 import { BigNumber } from '@ethersproject/bignumber'
 
 import { Order } from 'legacy/state/orders/actions'
@@ -5,9 +6,6 @@ import { calculateGasMargin } from 'legacy/utils/calculateGasMargin'
 
 import { logTradeFlowError } from 'modules/trade/utils/logger'
 
-import { GPv2Settlement } from 'abis/types'
-import { CoWSwapEthFlow } from 'abis/types/ethflow'
-
 // Fallback If we couldn't estimate gas for on-chain cancellation
 const CANCELLATION_GAS_LIMIT_DEFAULT = BigNumber.from(150000)
 const LOG_LABEL = 'CANCEL ETH FLOW ORDER'
diff --git a/src/common/hooks/useShouldZeroApprove/shouldZeroApprove.ts b/src/common/hooks/useShouldZeroApprove/shouldZeroApprove.ts
index 07cd199a7d..1e9cb9a7d2 100644
--- a/src/common/hooks/useShouldZeroApprove/shouldZeroApprove.ts
+++ b/src/common/hooks/useShouldZeroApprove/shouldZeroApprove.ts
@@ -1,8 +1,8 @@
+import { Erc20 } from '@cowprotocol/abis'
 import { Currency, CurrencyAmount } from '@uniswap/sdk-core'
 
 import { Nullish } from 'types'
 
-import { Erc20 } from 'legacy/abis/types'
 import { ApprovalState } from 'legacy/hooks/useApproveCallback'
 
 interface ShouldZeroApproveBaseParams {
diff --git a/src/legacy/abis/governor-bravo.json b/src/legacy/abis/governor-bravo.json
deleted file mode 100644
index ecd3ff1884..0000000000
--- a/src/legacy/abis/governor-bravo.json
+++ /dev/null
@@ -1,1046 +0,0 @@
-[
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "address",
-        "name": "oldAdmin",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "internalType": "address",
-        "name": "newAdmin",
-        "type": "address"
-      }
-    ],
-    "name": "NewAdmin",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "address",
-        "name": "oldImplementation",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "internalType": "address",
-        "name": "newImplementation",
-        "type": "address"
-      }
-    ],
-    "name": "NewImplementation",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "address",
-        "name": "oldPendingAdmin",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "internalType": "address",
-        "name": "newPendingAdmin",
-        "type": "address"
-      }
-    ],
-    "name": "NewPendingAdmin",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "id",
-        "type": "uint256"
-      }
-    ],
-    "name": "ProposalCanceled",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "id",
-        "type": "uint256"
-      },
-      {
-        "indexed": false,
-        "internalType": "address",
-        "name": "proposer",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "internalType": "address[]",
-        "name": "targets",
-        "type": "address[]"
-      },
-      {
-        "indexed": false,
-        "internalType": "uint256[]",
-        "name": "values",
-        "type": "uint256[]"
-      },
-      {
-        "indexed": false,
-        "internalType": "string[]",
-        "name": "signatures",
-        "type": "string[]"
-      },
-      {
-        "indexed": false,
-        "internalType": "bytes[]",
-        "name": "calldatas",
-        "type": "bytes[]"
-      },
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "startBlock",
-        "type": "uint256"
-      },
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "endBlock",
-        "type": "uint256"
-      },
-      {
-        "indexed": false,
-        "internalType": "string",
-        "name": "description",
-        "type": "string"
-      }
-    ],
-    "name": "ProposalCreated",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "id",
-        "type": "uint256"
-      }
-    ],
-    "name": "ProposalExecuted",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "id",
-        "type": "uint256"
-      },
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "eta",
-        "type": "uint256"
-      }
-    ],
-    "name": "ProposalQueued",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "oldProposalThreshold",
-        "type": "uint256"
-      },
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "newProposalThreshold",
-        "type": "uint256"
-      }
-    ],
-    "name": "ProposalThresholdSet",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "voter",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "proposalId",
-        "type": "uint256"
-      },
-      {
-        "indexed": false,
-        "internalType": "uint8",
-        "name": "support",
-        "type": "uint8"
-      },
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "votes",
-        "type": "uint256"
-      },
-      {
-        "indexed": false,
-        "internalType": "string",
-        "name": "reason",
-        "type": "string"
-      }
-    ],
-    "name": "VoteCast",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "oldVotingDelay",
-        "type": "uint256"
-      },
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "newVotingDelay",
-        "type": "uint256"
-      }
-    ],
-    "name": "VotingDelaySet",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "oldVotingPeriod",
-        "type": "uint256"
-      },
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "newVotingPeriod",
-        "type": "uint256"
-      }
-    ],
-    "name": "VotingPeriodSet",
-    "type": "event"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "BALLOT_TYPEHASH",
-    "outputs": [
-      {
-        "internalType": "bytes32",
-        "name": "",
-        "type": "bytes32"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "DOMAIN_TYPEHASH",
-    "outputs": [
-      {
-        "internalType": "bytes32",
-        "name": "",
-        "type": "bytes32"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "MAX_PROPOSAL_THRESHOLD",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "MAX_VOTING_DELAY",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "MAX_VOTING_PERIOD",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "MIN_PROPOSAL_THRESHOLD",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "MIN_VOTING_DELAY",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "MIN_VOTING_PERIOD",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [],
-    "name": "_acceptAdmin",
-    "outputs": [],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "proposalCount",
-        "type": "uint256"
-      }
-    ],
-    "name": "_initiate",
-    "outputs": [],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "newPendingAdmin",
-        "type": "address"
-      }
-    ],
-    "name": "_setPendingAdmin",
-    "outputs": [],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "newProposalThreshold",
-        "type": "uint256"
-      }
-    ],
-    "name": "_setProposalThreshold",
-    "outputs": [],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "newVotingDelay",
-        "type": "uint256"
-      }
-    ],
-    "name": "_setVotingDelay",
-    "outputs": [],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "newVotingPeriod",
-        "type": "uint256"
-      }
-    ],
-    "name": "_setVotingPeriod",
-    "outputs": [],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "admin",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "proposalId",
-        "type": "uint256"
-      }
-    ],
-    "name": "cancel",
-    "outputs": [],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "proposalId",
-        "type": "uint256"
-      },
-      {
-        "internalType": "uint8",
-        "name": "support",
-        "type": "uint8"
-      }
-    ],
-    "name": "castVote",
-    "outputs": [],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "proposalId",
-        "type": "uint256"
-      },
-      {
-        "internalType": "uint8",
-        "name": "support",
-        "type": "uint8"
-      },
-      {
-        "internalType": "uint8",
-        "name": "v",
-        "type": "uint8"
-      },
-      {
-        "internalType": "bytes32",
-        "name": "r",
-        "type": "bytes32"
-      },
-      {
-        "internalType": "bytes32",
-        "name": "s",
-        "type": "bytes32"
-      }
-    ],
-    "name": "castVoteBySig",
-    "outputs": [],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "proposalId",
-        "type": "uint256"
-      },
-      {
-        "internalType": "uint8",
-        "name": "support",
-        "type": "uint8"
-      },
-      {
-        "internalType": "string",
-        "name": "reason",
-        "type": "string"
-      }
-    ],
-    "name": "castVoteWithReason",
-    "outputs": [],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "proposalId",
-        "type": "uint256"
-      }
-    ],
-    "name": "execute",
-    "outputs": [],
-    "payable": true,
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "proposalId",
-        "type": "uint256"
-      }
-    ],
-    "name": "getActions",
-    "outputs": [
-      {
-        "internalType": "address[]",
-        "name": "targets",
-        "type": "address[]"
-      },
-      {
-        "internalType": "uint256[]",
-        "name": "values",
-        "type": "uint256[]"
-      },
-      {
-        "internalType": "string[]",
-        "name": "signatures",
-        "type": "string[]"
-      },
-      {
-        "internalType": "bytes[]",
-        "name": "calldatas",
-        "type": "bytes[]"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "proposalId",
-        "type": "uint256"
-      },
-      {
-        "internalType": "address",
-        "name": "voter",
-        "type": "address"
-      }
-    ],
-    "name": "getReceipt",
-    "outputs": [
-      {
-        "components": [
-          {
-            "internalType": "bool",
-            "name": "hasVoted",
-            "type": "bool"
-          },
-          {
-            "internalType": "uint8",
-            "name": "support",
-            "type": "uint8"
-          },
-          {
-            "internalType": "uint96",
-            "name": "votes",
-            "type": "uint96"
-          }
-        ],
-        "internalType": "struct GovernorBravoDelegateStorageV1.Receipt",
-        "name": "",
-        "type": "tuple"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "implementation",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "initialProposalId",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "timelock_",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "uni_",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "votingPeriod_",
-        "type": "uint256"
-      },
-      {
-        "internalType": "uint256",
-        "name": "votingDelay_",
-        "type": "uint256"
-      },
-      {
-        "internalType": "uint256",
-        "name": "proposalThreshold_",
-        "type": "uint256"
-      }
-    ],
-    "name": "initialize",
-    "outputs": [],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "name": "latestProposalIds",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "name",
-    "outputs": [
-      {
-        "internalType": "string",
-        "name": "",
-        "type": "string"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "pendingAdmin",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "proposalCount",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "proposalMaxOperations",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "proposalThreshold",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "name": "proposals",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "id",
-        "type": "uint256"
-      },
-      {
-        "internalType": "address",
-        "name": "proposer",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "eta",
-        "type": "uint256"
-      },
-      {
-        "internalType": "uint256",
-        "name": "startBlock",
-        "type": "uint256"
-      },
-      {
-        "internalType": "uint256",
-        "name": "endBlock",
-        "type": "uint256"
-      },
-      {
-        "internalType": "uint256",
-        "name": "forVotes",
-        "type": "uint256"
-      },
-      {
-        "internalType": "uint256",
-        "name": "againstVotes",
-        "type": "uint256"
-      },
-      {
-        "internalType": "uint256",
-        "name": "abstainVotes",
-        "type": "uint256"
-      },
-      {
-        "internalType": "bool",
-        "name": "canceled",
-        "type": "bool"
-      },
-      {
-        "internalType": "bool",
-        "name": "executed",
-        "type": "bool"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "internalType": "address[]",
-        "name": "targets",
-        "type": "address[]"
-      },
-      {
-        "internalType": "uint256[]",
-        "name": "values",
-        "type": "uint256[]"
-      },
-      {
-        "internalType": "string[]",
-        "name": "signatures",
-        "type": "string[]"
-      },
-      {
-        "internalType": "bytes[]",
-        "name": "calldatas",
-        "type": "bytes[]"
-      },
-      {
-        "internalType": "string",
-        "name": "description",
-        "type": "string"
-      }
-    ],
-    "name": "propose",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "proposalId",
-        "type": "uint256"
-      }
-    ],
-    "name": "queue",
-    "outputs": [],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "quorumVotes",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "proposalId",
-        "type": "uint256"
-      }
-    ],
-    "name": "state",
-    "outputs": [
-      {
-        "internalType": "enum GovernorBravoDelegateStorageV1.ProposalState",
-        "name": "",
-        "type": "uint8"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "timelock",
-    "outputs": [
-      {
-        "internalType": "contract TimelockInterface",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "uni",
-    "outputs": [
-      {
-        "internalType": "contract UniInterface",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "votingDelay",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "votingPeriod",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  }
-]
diff --git a/src/legacy/abis/multicall.json b/src/legacy/abis/multicall.json
deleted file mode 100644
index 08a075de64..0000000000
--- a/src/legacy/abis/multicall.json
+++ /dev/null
@@ -1,330 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "components": [
-          {
-            "internalType": "address",
-            "name": "target",
-            "type": "address"
-          },
-          {
-            "internalType": "bytes",
-            "name": "callData",
-            "type": "bytes"
-          }
-        ],
-        "internalType": "struct Multicall2.Call[]",
-        "name": "calls",
-        "type": "tuple[]"
-      }
-    ],
-    "name": "aggregate",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "blockNumber",
-        "type": "uint256"
-      },
-      {
-        "internalType": "bytes[]",
-        "name": "returnData",
-        "type": "bytes[]"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "components": [
-          {
-            "internalType": "address",
-            "name": "target",
-            "type": "address"
-          },
-          {
-            "internalType": "bytes",
-            "name": "callData",
-            "type": "bytes"
-          }
-        ],
-        "internalType": "struct Multicall2.Call[]",
-        "name": "calls",
-        "type": "tuple[]"
-      }
-    ],
-    "name": "blockAndAggregate",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "blockNumber",
-        "type": "uint256"
-      },
-      {
-        "internalType": "bytes32",
-        "name": "blockHash",
-        "type": "bytes32"
-      },
-      {
-        "components": [
-          {
-            "internalType": "bool",
-            "name": "success",
-            "type": "bool"
-          },
-          {
-            "internalType": "bytes",
-            "name": "returnData",
-            "type": "bytes"
-          }
-        ],
-        "internalType": "struct Multicall2.Result[]",
-        "name": "returnData",
-        "type": "tuple[]"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "blockNumber",
-        "type": "uint256"
-      }
-    ],
-    "name": "getBlockHash",
-    "outputs": [
-      {
-        "internalType": "bytes32",
-        "name": "blockHash",
-        "type": "bytes32"
-      },
-      {
-        "components": [
-          {
-            "internalType": "bool",
-            "name": "success",
-            "type": "bool"
-          },
-          {
-            "internalType": "bytes",
-            "name": "returnData",
-            "type": "bytes"
-          }
-        ],
-        "internalType": "struct Multicall2.Result[]",
-        "name": "returnData",
-        "type": "tuple[]"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "getBlockNumber",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "blockNumber",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "getCurrentBlockCoinbase",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "coinbase",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "getCurrentBlockDifficulty",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "difficulty",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "getCurrentBlockGasLimit",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "gaslimit",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "getCurrentBlockTimestamp",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "timestamp",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "addr",
-        "type": "address"
-      }
-    ],
-    "name": "getEthBalance",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "balance",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "getLastBlockHash",
-    "outputs": [
-      {
-        "internalType": "bytes32",
-        "name": "blockHash",
-        "type": "bytes32"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "bool",
-        "name": "requireSuccess",
-        "type": "bool"
-      },
-      {
-        "components": [
-          {
-            "internalType": "address",
-            "name": "target",
-            "type": "address"
-          },
-          {
-            "internalType": "bytes",
-            "name": "callData",
-            "type": "bytes"
-          }
-        ],
-        "internalType": "struct Multicall2.Call[]",
-        "name": "calls",
-        "type": "tuple[]"
-      }
-    ],
-    "name": "tryAggregate",
-    "outputs": [
-      {
-        "components": [
-          {
-            "internalType": "bool",
-            "name": "success",
-            "type": "bool"
-          },
-          {
-            "internalType": "bytes",
-            "name": "returnData",
-            "type": "bytes"
-          }
-        ],
-        "internalType": "struct Multicall2.Result[]",
-        "name": "returnData",
-        "type": "tuple[]"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "bool",
-        "name": "requireSuccess",
-        "type": "bool"
-      },
-      {
-        "components": [
-          {
-            "internalType": "address",
-            "name": "target",
-            "type": "address"
-          },
-          {
-            "internalType": "bytes",
-            "name": "callData",
-            "type": "bytes"
-          }
-        ],
-        "internalType": "struct Multicall2.Call[]",
-        "name": "calls",
-        "type": "tuple[]"
-      }
-    ],
-    "name": "tryBlockAndAggregate",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "blockNumber",
-        "type": "uint256"
-      },
-      {
-        "internalType": "bytes32",
-        "name": "blockHash",
-        "type": "bytes32"
-      },
-      {
-        "components": [
-          {
-            "internalType": "bool",
-            "name": "success",
-            "type": "bool"
-          },
-          {
-            "internalType": "bytes",
-            "name": "returnData",
-            "type": "bytes"
-          }
-        ],
-        "internalType": "struct Multicall2.Result[]",
-        "name": "returnData",
-        "type": "tuple[]"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
diff --git a/src/legacy/abis/multicall2.json b/src/legacy/abis/multicall2.json
deleted file mode 100644
index 76cadf4c97..0000000000
--- a/src/legacy/abis/multicall2.json
+++ /dev/null
@@ -1,165 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "components": [
-          { "internalType": "address", "name": "target", "type": "address" },
-          { "internalType": "bytes", "name": "callData", "type": "bytes" }
-        ],
-        "internalType": "struct Multicall2.Call[]",
-        "name": "calls",
-        "type": "tuple[]"
-      }
-    ],
-    "name": "aggregate",
-    "outputs": [
-      { "internalType": "uint256", "name": "blockNumber", "type": "uint256" },
-      { "internalType": "bytes[]", "name": "returnData", "type": "bytes[]" }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "components": [
-          { "internalType": "address", "name": "target", "type": "address" },
-          { "internalType": "bytes", "name": "callData", "type": "bytes" }
-        ],
-        "internalType": "struct Multicall2.Call[]",
-        "name": "calls",
-        "type": "tuple[]"
-      }
-    ],
-    "name": "blockAndAggregate",
-    "outputs": [
-      { "internalType": "uint256", "name": "blockNumber", "type": "uint256" },
-      { "internalType": "bytes32", "name": "blockHash", "type": "bytes32" },
-      {
-        "components": [
-          { "internalType": "bool", "name": "success", "type": "bool" },
-          { "internalType": "bytes", "name": "returnData", "type": "bytes" }
-        ],
-        "internalType": "struct Multicall2.Result[]",
-        "name": "returnData",
-        "type": "tuple[]"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [{ "internalType": "uint256", "name": "blockNumber", "type": "uint256" }],
-    "name": "getBlockHash",
-    "outputs": [{ "internalType": "bytes32", "name": "blockHash", "type": "bytes32" }],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "getBlockNumber",
-    "outputs": [{ "internalType": "uint256", "name": "blockNumber", "type": "uint256" }],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "getCurrentBlockCoinbase",
-    "outputs": [{ "internalType": "address", "name": "coinbase", "type": "address" }],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "getCurrentBlockDifficulty",
-    "outputs": [{ "internalType": "uint256", "name": "difficulty", "type": "uint256" }],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "getCurrentBlockGasLimit",
-    "outputs": [{ "internalType": "uint256", "name": "gaslimit", "type": "uint256" }],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "getCurrentBlockTimestamp",
-    "outputs": [{ "internalType": "uint256", "name": "timestamp", "type": "uint256" }],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [{ "internalType": "address", "name": "addr", "type": "address" }],
-    "name": "getEthBalance",
-    "outputs": [{ "internalType": "uint256", "name": "balance", "type": "uint256" }],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "getLastBlockHash",
-    "outputs": [{ "internalType": "bytes32", "name": "blockHash", "type": "bytes32" }],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      { "internalType": "bool", "name": "requireSuccess", "type": "bool" },
-      {
-        "components": [
-          { "internalType": "address", "name": "target", "type": "address" },
-          { "internalType": "bytes", "name": "callData", "type": "bytes" }
-        ],
-        "internalType": "struct Multicall2.Call[]",
-        "name": "calls",
-        "type": "tuple[]"
-      }
-    ],
-    "name": "tryAggregate",
-    "outputs": [
-      {
-        "components": [
-          { "internalType": "bool", "name": "success", "type": "bool" },
-          { "internalType": "bytes", "name": "returnData", "type": "bytes" }
-        ],
-        "internalType": "struct Multicall2.Result[]",
-        "name": "returnData",
-        "type": "tuple[]"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      { "internalType": "bool", "name": "requireSuccess", "type": "bool" },
-      {
-        "components": [
-          { "internalType": "address", "name": "target", "type": "address" },
-          { "internalType": "bytes", "name": "callData", "type": "bytes" }
-        ],
-        "internalType": "struct Multicall2.Call[]",
-        "name": "calls",
-        "type": "tuple[]"
-      }
-    ],
-    "name": "tryBlockAndAggregate",
-    "outputs": [
-      { "internalType": "uint256", "name": "blockNumber", "type": "uint256" },
-      { "internalType": "bytes32", "name": "blockHash", "type": "bytes32" },
-      {
-        "components": [
-          { "internalType": "bool", "name": "success", "type": "bool" },
-          { "internalType": "bytes", "name": "returnData", "type": "bytes" }
-        ],
-        "internalType": "struct Multicall2.Result[]",
-        "name": "returnData",
-        "type": "tuple[]"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
diff --git a/src/legacy/abis/types/ArgentWalletContract.d.ts b/src/legacy/abis/types/ArgentWalletContract.d.ts
deleted file mode 100644
index e87686c56f..0000000000
--- a/src/legacy/abis/types/ArgentWalletContract.d.ts
+++ /dev/null
@@ -1,156 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-
-import {
-  ethers,
-  EventFilter,
-  Signer,
-  BigNumber,
-  BigNumberish,
-  PopulatedTransaction,
-  BaseContract,
-  ContractTransaction,
-  Overrides,
-  CallOverrides,
-} from "ethers";
-import { BytesLike } from "@ethersproject/bytes";
-import { Listener, Provider } from "@ethersproject/providers";
-import { FunctionFragment, EventFragment, Result } from "@ethersproject/abi";
-import type { TypedEventFilter, TypedEvent, TypedListener } from "./common";
-
-interface ArgentWalletContractInterface extends ethers.utils.Interface {
-  functions: {
-    "wc_multiCall(tuple[])": FunctionFragment;
-    "isValidSignature(bytes32,bytes)": FunctionFragment;
-  };
-
-  encodeFunctionData(
-    functionFragment: "wc_multiCall",
-    values: [{ to: string; value: BigNumberish; data: BytesLike }[]]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "isValidSignature",
-    values: [BytesLike, BytesLike]
-  ): string;
-
-  decodeFunctionResult(
-    functionFragment: "wc_multiCall",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "isValidSignature",
-    data: BytesLike
-  ): Result;
-
-  events: {};
-}
-
-export class ArgentWalletContract extends BaseContract {
-  connect(signerOrProvider: Signer | Provider | string): this;
-  attach(addressOrName: string): this;
-  deployed(): Promise<this>;
-
-  listeners<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter?: TypedEventFilter<EventArgsArray, EventArgsObject>
-  ): Array<TypedListener<EventArgsArray, EventArgsObject>>;
-  off<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    listener: TypedListener<EventArgsArray, EventArgsObject>
-  ): this;
-  on<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    listener: TypedListener<EventArgsArray, EventArgsObject>
-  ): this;
-  once<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    listener: TypedListener<EventArgsArray, EventArgsObject>
-  ): this;
-  removeListener<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    listener: TypedListener<EventArgsArray, EventArgsObject>
-  ): this;
-  removeAllListeners<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>
-  ): this;
-
-  listeners(eventName?: string): Array<Listener>;
-  off(eventName: string, listener: Listener): this;
-  on(eventName: string, listener: Listener): this;
-  once(eventName: string, listener: Listener): this;
-  removeListener(eventName: string, listener: Listener): this;
-  removeAllListeners(eventName?: string): this;
-
-  queryFilter<EventArgsArray extends Array<any>, EventArgsObject>(
-    event: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    fromBlockOrBlockhash?: string | number | undefined,
-    toBlock?: string | number | undefined
-  ): Promise<Array<TypedEvent<EventArgsArray & EventArgsObject>>>;
-
-  interface: ArgentWalletContractInterface;
-
-  functions: {
-    wc_multiCall(
-      _transactions: { to: string; value: BigNumberish; data: BytesLike }[],
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    isValidSignature(
-      _msgHash: BytesLike,
-      _signature: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<[string]>;
-  };
-
-  wc_multiCall(
-    _transactions: { to: string; value: BigNumberish; data: BytesLike }[],
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  isValidSignature(
-    _msgHash: BytesLike,
-    _signature: BytesLike,
-    overrides?: CallOverrides
-  ): Promise<string>;
-
-  callStatic: {
-    wc_multiCall(
-      _transactions: { to: string; value: BigNumberish; data: BytesLike }[],
-      overrides?: CallOverrides
-    ): Promise<string[]>;
-
-    isValidSignature(
-      _msgHash: BytesLike,
-      _signature: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<string>;
-  };
-
-  filters: {};
-
-  estimateGas: {
-    wc_multiCall(
-      _transactions: { to: string; value: BigNumberish; data: BytesLike }[],
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    isValidSignature(
-      _msgHash: BytesLike,
-      _signature: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-  };
-
-  populateTransaction: {
-    wc_multiCall(
-      _transactions: { to: string; value: BigNumberish; data: BytesLike }[],
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    isValidSignature(
-      _msgHash: BytesLike,
-      _signature: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-  };
-}
diff --git a/src/legacy/abis/types/ArgentWalletContract.ts b/src/legacy/abis/types/ArgentWalletContract.ts
deleted file mode 100644
index d473d01816..0000000000
--- a/src/legacy/abis/types/ArgentWalletContract.ts
+++ /dev/null
@@ -1,173 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-import type {
-  BaseContract,
-  BigNumber,
-  BigNumberish,
-  BytesLike,
-  CallOverrides,
-  ContractTransaction,
-  Overrides,
-  PopulatedTransaction,
-  Signer,
-  utils,
-} from "ethers";
-import type { FunctionFragment, Result } from "@ethersproject/abi";
-import type { Listener, Provider } from "@ethersproject/providers";
-import type {
-  TypedEventFilter,
-  TypedEvent,
-  TypedListener,
-  OnEvent,
-  PromiseOrValue,
-} from "./common";
-
-export interface ArgentWalletContractInterface extends utils.Interface {
-  functions: {
-    "wc_multiCall((address,uint256,bytes)[])": FunctionFragment;
-    "isValidSignature(bytes32,bytes)": FunctionFragment;
-  };
-
-  getFunction(
-    nameOrSignatureOrTopic: "wc_multiCall" | "isValidSignature"
-  ): FunctionFragment;
-
-  encodeFunctionData(
-    functionFragment: "wc_multiCall",
-    values: [
-      {
-        to: PromiseOrValue<string>;
-        value: PromiseOrValue<BigNumberish>;
-        data: PromiseOrValue<BytesLike>;
-      }[]
-    ]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "isValidSignature",
-    values: [PromiseOrValue<BytesLike>, PromiseOrValue<BytesLike>]
-  ): string;
-
-  decodeFunctionResult(
-    functionFragment: "wc_multiCall",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "isValidSignature",
-    data: BytesLike
-  ): Result;
-
-  events: {};
-}
-
-export interface ArgentWalletContract extends BaseContract {
-  connect(signerOrProvider: Signer | Provider | string): this;
-  attach(addressOrName: string): this;
-  deployed(): Promise<this>;
-
-  interface: ArgentWalletContractInterface;
-
-  queryFilter<TEvent extends TypedEvent>(
-    event: TypedEventFilter<TEvent>,
-    fromBlockOrBlockhash?: string | number | undefined,
-    toBlock?: string | number | undefined
-  ): Promise<Array<TEvent>>;
-
-  listeners<TEvent extends TypedEvent>(
-    eventFilter?: TypedEventFilter<TEvent>
-  ): Array<TypedListener<TEvent>>;
-  listeners(eventName?: string): Array<Listener>;
-  removeAllListeners<TEvent extends TypedEvent>(
-    eventFilter: TypedEventFilter<TEvent>
-  ): this;
-  removeAllListeners(eventName?: string): this;
-  off: OnEvent<this>;
-  on: OnEvent<this>;
-  once: OnEvent<this>;
-  removeListener: OnEvent<this>;
-
-  functions: {
-    wc_multiCall(
-      _transactions: {
-        to: PromiseOrValue<string>;
-        value: PromiseOrValue<BigNumberish>;
-        data: PromiseOrValue<BytesLike>;
-      }[],
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<ContractTransaction>;
-
-    isValidSignature(
-      _msgHash: PromiseOrValue<BytesLike>,
-      _signature: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<[string]>;
-  };
-
-  wc_multiCall(
-    _transactions: {
-      to: PromiseOrValue<string>;
-      value: PromiseOrValue<BigNumberish>;
-      data: PromiseOrValue<BytesLike>;
-    }[],
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
-  ): Promise<ContractTransaction>;
-
-  isValidSignature(
-    _msgHash: PromiseOrValue<BytesLike>,
-    _signature: PromiseOrValue<BytesLike>,
-    overrides?: CallOverrides
-  ): Promise<string>;
-
-  callStatic: {
-    wc_multiCall(
-      _transactions: {
-        to: PromiseOrValue<string>;
-        value: PromiseOrValue<BigNumberish>;
-        data: PromiseOrValue<BytesLike>;
-      }[],
-      overrides?: CallOverrides
-    ): Promise<string[]>;
-
-    isValidSignature(
-      _msgHash: PromiseOrValue<BytesLike>,
-      _signature: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<string>;
-  };
-
-  filters: {};
-
-  estimateGas: {
-    wc_multiCall(
-      _transactions: {
-        to: PromiseOrValue<string>;
-        value: PromiseOrValue<BigNumberish>;
-        data: PromiseOrValue<BytesLike>;
-      }[],
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<BigNumber>;
-
-    isValidSignature(
-      _msgHash: PromiseOrValue<BytesLike>,
-      _signature: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-  };
-
-  populateTransaction: {
-    wc_multiCall(
-      _transactions: {
-        to: PromiseOrValue<string>;
-        value: PromiseOrValue<BigNumberish>;
-        data: PromiseOrValue<BytesLike>;
-      }[],
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<PopulatedTransaction>;
-
-    isValidSignature(
-      _msgHash: PromiseOrValue<BytesLike>,
-      _signature: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-  };
-}
diff --git a/src/legacy/abis/types/ArgentWalletDetector.d.ts b/src/legacy/abis/types/ArgentWalletDetector.d.ts
deleted file mode 100644
index 17b44a47c2..0000000000
--- a/src/legacy/abis/types/ArgentWalletDetector.d.ts
+++ /dev/null
@@ -1,387 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-
-import {
-  ethers,
-  EventFilter,
-  Signer,
-  BigNumber,
-  BigNumberish,
-  PopulatedTransaction,
-  BaseContract,
-  ContractTransaction,
-  Overrides,
-  CallOverrides,
-} from "ethers";
-import { BytesLike } from "@ethersproject/bytes";
-import { Listener, Provider } from "@ethersproject/providers";
-import { FunctionFragment, EventFragment, Result } from "@ethersproject/abi";
-import type { TypedEventFilter, TypedEvent, TypedListener } from "./common";
-
-interface ArgentWalletDetectorInterface extends ethers.utils.Interface {
-  functions: {
-    "acceptedCodes(bytes32)": FunctionFragment;
-    "acceptedImplementations(address)": FunctionFragment;
-    "addCode(bytes32)": FunctionFragment;
-    "addCodeAndImplementationFromWallet(address)": FunctionFragment;
-    "addImplementation(address)": FunctionFragment;
-    "changeOwner(address)": FunctionFragment;
-    "getCodes()": FunctionFragment;
-    "getImplementations()": FunctionFragment;
-    "isArgentWallet(address)": FunctionFragment;
-    "owner()": FunctionFragment;
-  };
-
-  encodeFunctionData(
-    functionFragment: "acceptedCodes",
-    values: [BytesLike]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "acceptedImplementations",
-    values: [string]
-  ): string;
-  encodeFunctionData(functionFragment: "addCode", values: [BytesLike]): string;
-  encodeFunctionData(
-    functionFragment: "addCodeAndImplementationFromWallet",
-    values: [string]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "addImplementation",
-    values: [string]
-  ): string;
-  encodeFunctionData(functionFragment: "changeOwner", values: [string]): string;
-  encodeFunctionData(functionFragment: "getCodes", values?: undefined): string;
-  encodeFunctionData(
-    functionFragment: "getImplementations",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "isArgentWallet",
-    values: [string]
-  ): string;
-  encodeFunctionData(functionFragment: "owner", values?: undefined): string;
-
-  decodeFunctionResult(
-    functionFragment: "acceptedCodes",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "acceptedImplementations",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "addCode", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "addCodeAndImplementationFromWallet",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "addImplementation",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "changeOwner",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "getCodes", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "getImplementations",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "isArgentWallet",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "owner", data: BytesLike): Result;
-
-  events: {
-    "CodeAdded(bytes32)": EventFragment;
-    "ImplementationAdded(address)": EventFragment;
-    "OwnerChanged(address)": EventFragment;
-  };
-
-  getEvent(nameOrSignatureOrTopic: "CodeAdded"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "ImplementationAdded"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "OwnerChanged"): EventFragment;
-}
-
-export type CodeAddedEvent = TypedEvent<[string] & { code: string }>;
-
-export type ImplementationAddedEvent = TypedEvent<
-  [string] & { implementation: string }
->;
-
-export type OwnerChangedEvent = TypedEvent<[string] & { _newOwner: string }>;
-
-export class ArgentWalletDetector extends BaseContract {
-  connect(signerOrProvider: Signer | Provider | string): this;
-  attach(addressOrName: string): this;
-  deployed(): Promise<this>;
-
-  listeners<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter?: TypedEventFilter<EventArgsArray, EventArgsObject>
-  ): Array<TypedListener<EventArgsArray, EventArgsObject>>;
-  off<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    listener: TypedListener<EventArgsArray, EventArgsObject>
-  ): this;
-  on<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    listener: TypedListener<EventArgsArray, EventArgsObject>
-  ): this;
-  once<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    listener: TypedListener<EventArgsArray, EventArgsObject>
-  ): this;
-  removeListener<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    listener: TypedListener<EventArgsArray, EventArgsObject>
-  ): this;
-  removeAllListeners<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>
-  ): this;
-
-  listeners(eventName?: string): Array<Listener>;
-  off(eventName: string, listener: Listener): this;
-  on(eventName: string, listener: Listener): this;
-  once(eventName: string, listener: Listener): this;
-  removeListener(eventName: string, listener: Listener): this;
-  removeAllListeners(eventName?: string): this;
-
-  queryFilter<EventArgsArray extends Array<any>, EventArgsObject>(
-    event: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    fromBlockOrBlockhash?: string | number | undefined,
-    toBlock?: string | number | undefined
-  ): Promise<Array<TypedEvent<EventArgsArray & EventArgsObject>>>;
-
-  interface: ArgentWalletDetectorInterface;
-
-  functions: {
-    acceptedCodes(
-      arg0: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<[boolean, BigNumber] & { exists: boolean; index: BigNumber }>;
-
-    acceptedImplementations(
-      arg0: string,
-      overrides?: CallOverrides
-    ): Promise<[boolean, BigNumber] & { exists: boolean; index: BigNumber }>;
-
-    addCode(
-      _code: BytesLike,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    addCodeAndImplementationFromWallet(
-      _argentWallet: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    addImplementation(
-      _impl: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    changeOwner(
-      _newOwner: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    getCodes(overrides?: CallOverrides): Promise<[string[]]>;
-
-    getImplementations(overrides?: CallOverrides): Promise<[string[]]>;
-
-    isArgentWallet(
-      _wallet: string,
-      overrides?: CallOverrides
-    ): Promise<[boolean]>;
-
-    owner(overrides?: CallOverrides): Promise<[string]>;
-  };
-
-  acceptedCodes(
-    arg0: BytesLike,
-    overrides?: CallOverrides
-  ): Promise<[boolean, BigNumber] & { exists: boolean; index: BigNumber }>;
-
-  acceptedImplementations(
-    arg0: string,
-    overrides?: CallOverrides
-  ): Promise<[boolean, BigNumber] & { exists: boolean; index: BigNumber }>;
-
-  addCode(
-    _code: BytesLike,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  addCodeAndImplementationFromWallet(
-    _argentWallet: string,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  addImplementation(
-    _impl: string,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  changeOwner(
-    _newOwner: string,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  getCodes(overrides?: CallOverrides): Promise<string[]>;
-
-  getImplementations(overrides?: CallOverrides): Promise<string[]>;
-
-  isArgentWallet(_wallet: string, overrides?: CallOverrides): Promise<boolean>;
-
-  owner(overrides?: CallOverrides): Promise<string>;
-
-  callStatic: {
-    acceptedCodes(
-      arg0: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<[boolean, BigNumber] & { exists: boolean; index: BigNumber }>;
-
-    acceptedImplementations(
-      arg0: string,
-      overrides?: CallOverrides
-    ): Promise<[boolean, BigNumber] & { exists: boolean; index: BigNumber }>;
-
-    addCode(_code: BytesLike, overrides?: CallOverrides): Promise<void>;
-
-    addCodeAndImplementationFromWallet(
-      _argentWallet: string,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    addImplementation(_impl: string, overrides?: CallOverrides): Promise<void>;
-
-    changeOwner(_newOwner: string, overrides?: CallOverrides): Promise<void>;
-
-    getCodes(overrides?: CallOverrides): Promise<string[]>;
-
-    getImplementations(overrides?: CallOverrides): Promise<string[]>;
-
-    isArgentWallet(
-      _wallet: string,
-      overrides?: CallOverrides
-    ): Promise<boolean>;
-
-    owner(overrides?: CallOverrides): Promise<string>;
-  };
-
-  filters: {
-    "CodeAdded(bytes32)"(
-      code?: BytesLike | null
-    ): TypedEventFilter<[string], { code: string }>;
-
-    CodeAdded(
-      code?: BytesLike | null
-    ): TypedEventFilter<[string], { code: string }>;
-
-    "ImplementationAdded(address)"(
-      implementation?: string | null
-    ): TypedEventFilter<[string], { implementation: string }>;
-
-    ImplementationAdded(
-      implementation?: string | null
-    ): TypedEventFilter<[string], { implementation: string }>;
-
-    "OwnerChanged(address)"(
-      _newOwner?: string | null
-    ): TypedEventFilter<[string], { _newOwner: string }>;
-
-    OwnerChanged(
-      _newOwner?: string | null
-    ): TypedEventFilter<[string], { _newOwner: string }>;
-  };
-
-  estimateGas: {
-    acceptedCodes(
-      arg0: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    acceptedImplementations(
-      arg0: string,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    addCode(
-      _code: BytesLike,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    addCodeAndImplementationFromWallet(
-      _argentWallet: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    addImplementation(
-      _impl: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    changeOwner(
-      _newOwner: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    getCodes(overrides?: CallOverrides): Promise<BigNumber>;
-
-    getImplementations(overrides?: CallOverrides): Promise<BigNumber>;
-
-    isArgentWallet(
-      _wallet: string,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    owner(overrides?: CallOverrides): Promise<BigNumber>;
-  };
-
-  populateTransaction: {
-    acceptedCodes(
-      arg0: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    acceptedImplementations(
-      arg0: string,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    addCode(
-      _code: BytesLike,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    addCodeAndImplementationFromWallet(
-      _argentWallet: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    addImplementation(
-      _impl: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    changeOwner(
-      _newOwner: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    getCodes(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    getImplementations(
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    isArgentWallet(
-      _wallet: string,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    owner(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-  };
-}
diff --git a/src/legacy/abis/types/ArgentWalletDetector.ts b/src/legacy/abis/types/ArgentWalletDetector.ts
deleted file mode 100644
index 06510863fc..0000000000
--- a/src/legacy/abis/types/ArgentWalletDetector.ts
+++ /dev/null
@@ -1,421 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-import type {
-  BaseContract,
-  BigNumber,
-  BytesLike,
-  CallOverrides,
-  ContractTransaction,
-  Overrides,
-  PopulatedTransaction,
-  Signer,
-  utils,
-} from "ethers";
-import type {
-  FunctionFragment,
-  Result,
-  EventFragment,
-} from "@ethersproject/abi";
-import type { Listener, Provider } from "@ethersproject/providers";
-import type {
-  TypedEventFilter,
-  TypedEvent,
-  TypedListener,
-  OnEvent,
-  PromiseOrValue,
-} from "./common";
-
-export interface ArgentWalletDetectorInterface extends utils.Interface {
-  functions: {
-    "acceptedCodes(bytes32)": FunctionFragment;
-    "acceptedImplementations(address)": FunctionFragment;
-    "addCode(bytes32)": FunctionFragment;
-    "addCodeAndImplementationFromWallet(address)": FunctionFragment;
-    "addImplementation(address)": FunctionFragment;
-    "changeOwner(address)": FunctionFragment;
-    "getCodes()": FunctionFragment;
-    "getImplementations()": FunctionFragment;
-    "isArgentWallet(address)": FunctionFragment;
-    "owner()": FunctionFragment;
-  };
-
-  getFunction(
-    nameOrSignatureOrTopic:
-      | "acceptedCodes"
-      | "acceptedImplementations"
-      | "addCode"
-      | "addCodeAndImplementationFromWallet"
-      | "addImplementation"
-      | "changeOwner"
-      | "getCodes"
-      | "getImplementations"
-      | "isArgentWallet"
-      | "owner"
-  ): FunctionFragment;
-
-  encodeFunctionData(
-    functionFragment: "acceptedCodes",
-    values: [PromiseOrValue<BytesLike>]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "acceptedImplementations",
-    values: [PromiseOrValue<string>]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "addCode",
-    values: [PromiseOrValue<BytesLike>]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "addCodeAndImplementationFromWallet",
-    values: [PromiseOrValue<string>]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "addImplementation",
-    values: [PromiseOrValue<string>]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "changeOwner",
-    values: [PromiseOrValue<string>]
-  ): string;
-  encodeFunctionData(functionFragment: "getCodes", values?: undefined): string;
-  encodeFunctionData(
-    functionFragment: "getImplementations",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "isArgentWallet",
-    values: [PromiseOrValue<string>]
-  ): string;
-  encodeFunctionData(functionFragment: "owner", values?: undefined): string;
-
-  decodeFunctionResult(
-    functionFragment: "acceptedCodes",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "acceptedImplementations",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "addCode", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "addCodeAndImplementationFromWallet",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "addImplementation",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "changeOwner",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "getCodes", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "getImplementations",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "isArgentWallet",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "owner", data: BytesLike): Result;
-
-  events: {
-    "CodeAdded(bytes32)": EventFragment;
-    "ImplementationAdded(address)": EventFragment;
-    "OwnerChanged(address)": EventFragment;
-  };
-
-  getEvent(nameOrSignatureOrTopic: "CodeAdded"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "ImplementationAdded"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "OwnerChanged"): EventFragment;
-}
-
-export interface CodeAddedEventObject {
-  code: string;
-}
-export type CodeAddedEvent = TypedEvent<[string], CodeAddedEventObject>;
-
-export type CodeAddedEventFilter = TypedEventFilter<CodeAddedEvent>;
-
-export interface ImplementationAddedEventObject {
-  implementation: string;
-}
-export type ImplementationAddedEvent = TypedEvent<
-  [string],
-  ImplementationAddedEventObject
->;
-
-export type ImplementationAddedEventFilter =
-  TypedEventFilter<ImplementationAddedEvent>;
-
-export interface OwnerChangedEventObject {
-  _newOwner: string;
-}
-export type OwnerChangedEvent = TypedEvent<[string], OwnerChangedEventObject>;
-
-export type OwnerChangedEventFilter = TypedEventFilter<OwnerChangedEvent>;
-
-export interface ArgentWalletDetector extends BaseContract {
-  connect(signerOrProvider: Signer | Provider | string): this;
-  attach(addressOrName: string): this;
-  deployed(): Promise<this>;
-
-  interface: ArgentWalletDetectorInterface;
-
-  queryFilter<TEvent extends TypedEvent>(
-    event: TypedEventFilter<TEvent>,
-    fromBlockOrBlockhash?: string | number | undefined,
-    toBlock?: string | number | undefined
-  ): Promise<Array<TEvent>>;
-
-  listeners<TEvent extends TypedEvent>(
-    eventFilter?: TypedEventFilter<TEvent>
-  ): Array<TypedListener<TEvent>>;
-  listeners(eventName?: string): Array<Listener>;
-  removeAllListeners<TEvent extends TypedEvent>(
-    eventFilter: TypedEventFilter<TEvent>
-  ): this;
-  removeAllListeners(eventName?: string): this;
-  off: OnEvent<this>;
-  on: OnEvent<this>;
-  once: OnEvent<this>;
-  removeListener: OnEvent<this>;
-
-  functions: {
-    acceptedCodes(
-      arg0: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<[boolean, BigNumber] & { exists: boolean; index: BigNumber }>;
-
-    acceptedImplementations(
-      arg0: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<[boolean, BigNumber] & { exists: boolean; index: BigNumber }>;
-
-    addCode(
-      _code: PromiseOrValue<BytesLike>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<ContractTransaction>;
-
-    addCodeAndImplementationFromWallet(
-      _argentWallet: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<ContractTransaction>;
-
-    addImplementation(
-      _impl: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<ContractTransaction>;
-
-    changeOwner(
-      _newOwner: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<ContractTransaction>;
-
-    getCodes(overrides?: CallOverrides): Promise<[string[]]>;
-
-    getImplementations(overrides?: CallOverrides): Promise<[string[]]>;
-
-    isArgentWallet(
-      _wallet: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<[boolean]>;
-
-    owner(overrides?: CallOverrides): Promise<[string]>;
-  };
-
-  acceptedCodes(
-    arg0: PromiseOrValue<BytesLike>,
-    overrides?: CallOverrides
-  ): Promise<[boolean, BigNumber] & { exists: boolean; index: BigNumber }>;
-
-  acceptedImplementations(
-    arg0: PromiseOrValue<string>,
-    overrides?: CallOverrides
-  ): Promise<[boolean, BigNumber] & { exists: boolean; index: BigNumber }>;
-
-  addCode(
-    _code: PromiseOrValue<BytesLike>,
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
-  ): Promise<ContractTransaction>;
-
-  addCodeAndImplementationFromWallet(
-    _argentWallet: PromiseOrValue<string>,
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
-  ): Promise<ContractTransaction>;
-
-  addImplementation(
-    _impl: PromiseOrValue<string>,
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
-  ): Promise<ContractTransaction>;
-
-  changeOwner(
-    _newOwner: PromiseOrValue<string>,
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
-  ): Promise<ContractTransaction>;
-
-  getCodes(overrides?: CallOverrides): Promise<string[]>;
-
-  getImplementations(overrides?: CallOverrides): Promise<string[]>;
-
-  isArgentWallet(
-    _wallet: PromiseOrValue<string>,
-    overrides?: CallOverrides
-  ): Promise<boolean>;
-
-  owner(overrides?: CallOverrides): Promise<string>;
-
-  callStatic: {
-    acceptedCodes(
-      arg0: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<[boolean, BigNumber] & { exists: boolean; index: BigNumber }>;
-
-    acceptedImplementations(
-      arg0: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<[boolean, BigNumber] & { exists: boolean; index: BigNumber }>;
-
-    addCode(
-      _code: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    addCodeAndImplementationFromWallet(
-      _argentWallet: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    addImplementation(
-      _impl: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    changeOwner(
-      _newOwner: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    getCodes(overrides?: CallOverrides): Promise<string[]>;
-
-    getImplementations(overrides?: CallOverrides): Promise<string[]>;
-
-    isArgentWallet(
-      _wallet: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<boolean>;
-
-    owner(overrides?: CallOverrides): Promise<string>;
-  };
-
-  filters: {
-    "CodeAdded(bytes32)"(
-      code?: PromiseOrValue<BytesLike> | null
-    ): CodeAddedEventFilter;
-    CodeAdded(code?: PromiseOrValue<BytesLike> | null): CodeAddedEventFilter;
-
-    "ImplementationAdded(address)"(
-      implementation?: PromiseOrValue<string> | null
-    ): ImplementationAddedEventFilter;
-    ImplementationAdded(
-      implementation?: PromiseOrValue<string> | null
-    ): ImplementationAddedEventFilter;
-
-    "OwnerChanged(address)"(
-      _newOwner?: PromiseOrValue<string> | null
-    ): OwnerChangedEventFilter;
-    OwnerChanged(
-      _newOwner?: PromiseOrValue<string> | null
-    ): OwnerChangedEventFilter;
-  };
-
-  estimateGas: {
-    acceptedCodes(
-      arg0: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    acceptedImplementations(
-      arg0: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    addCode(
-      _code: PromiseOrValue<BytesLike>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<BigNumber>;
-
-    addCodeAndImplementationFromWallet(
-      _argentWallet: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<BigNumber>;
-
-    addImplementation(
-      _impl: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<BigNumber>;
-
-    changeOwner(
-      _newOwner: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<BigNumber>;
-
-    getCodes(overrides?: CallOverrides): Promise<BigNumber>;
-
-    getImplementations(overrides?: CallOverrides): Promise<BigNumber>;
-
-    isArgentWallet(
-      _wallet: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    owner(overrides?: CallOverrides): Promise<BigNumber>;
-  };
-
-  populateTransaction: {
-    acceptedCodes(
-      arg0: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    acceptedImplementations(
-      arg0: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    addCode(
-      _code: PromiseOrValue<BytesLike>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<PopulatedTransaction>;
-
-    addCodeAndImplementationFromWallet(
-      _argentWallet: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<PopulatedTransaction>;
-
-    addImplementation(
-      _impl: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<PopulatedTransaction>;
-
-    changeOwner(
-      _newOwner: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<PopulatedTransaction>;
-
-    getCodes(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    getImplementations(
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    isArgentWallet(
-      _wallet: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    owner(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-  };
-}
diff --git a/src/legacy/abis/types/Eip2612.d.ts b/src/legacy/abis/types/Eip2612.d.ts
deleted file mode 100644
index 559952909a..0000000000
--- a/src/legacy/abis/types/Eip2612.d.ts
+++ /dev/null
@@ -1,117 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-
-import {
-  ethers,
-  EventFilter,
-  Signer,
-  BigNumber,
-  BigNumberish,
-  PopulatedTransaction,
-  BaseContract,
-  ContractTransaction,
-  CallOverrides,
-} from "ethers";
-import { BytesLike } from "@ethersproject/bytes";
-import { Listener, Provider } from "@ethersproject/providers";
-import { FunctionFragment, EventFragment, Result } from "@ethersproject/abi";
-import type { TypedEventFilter, TypedEvent, TypedListener } from "./common";
-
-interface Eip2612Interface extends ethers.utils.Interface {
-  functions: {
-    "nonces(address)": FunctionFragment;
-    "DOMAIN_SEPARATOR()": FunctionFragment;
-  };
-
-  encodeFunctionData(functionFragment: "nonces", values: [string]): string;
-  encodeFunctionData(
-    functionFragment: "DOMAIN_SEPARATOR",
-    values?: undefined
-  ): string;
-
-  decodeFunctionResult(functionFragment: "nonces", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "DOMAIN_SEPARATOR",
-    data: BytesLike
-  ): Result;
-
-  events: {};
-}
-
-export class Eip2612 extends BaseContract {
-  connect(signerOrProvider: Signer | Provider | string): this;
-  attach(addressOrName: string): this;
-  deployed(): Promise<this>;
-
-  listeners<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter?: TypedEventFilter<EventArgsArray, EventArgsObject>
-  ): Array<TypedListener<EventArgsArray, EventArgsObject>>;
-  off<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    listener: TypedListener<EventArgsArray, EventArgsObject>
-  ): this;
-  on<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    listener: TypedListener<EventArgsArray, EventArgsObject>
-  ): this;
-  once<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    listener: TypedListener<EventArgsArray, EventArgsObject>
-  ): this;
-  removeListener<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    listener: TypedListener<EventArgsArray, EventArgsObject>
-  ): this;
-  removeAllListeners<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>
-  ): this;
-
-  listeners(eventName?: string): Array<Listener>;
-  off(eventName: string, listener: Listener): this;
-  on(eventName: string, listener: Listener): this;
-  once(eventName: string, listener: Listener): this;
-  removeListener(eventName: string, listener: Listener): this;
-  removeAllListeners(eventName?: string): this;
-
-  queryFilter<EventArgsArray extends Array<any>, EventArgsObject>(
-    event: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    fromBlockOrBlockhash?: string | number | undefined,
-    toBlock?: string | number | undefined
-  ): Promise<Array<TypedEvent<EventArgsArray & EventArgsObject>>>;
-
-  interface: Eip2612Interface;
-
-  functions: {
-    nonces(owner: string, overrides?: CallOverrides): Promise<[BigNumber]>;
-
-    DOMAIN_SEPARATOR(overrides?: CallOverrides): Promise<[string]>;
-  };
-
-  nonces(owner: string, overrides?: CallOverrides): Promise<BigNumber>;
-
-  DOMAIN_SEPARATOR(overrides?: CallOverrides): Promise<string>;
-
-  callStatic: {
-    nonces(owner: string, overrides?: CallOverrides): Promise<BigNumber>;
-
-    DOMAIN_SEPARATOR(overrides?: CallOverrides): Promise<string>;
-  };
-
-  filters: {};
-
-  estimateGas: {
-    nonces(owner: string, overrides?: CallOverrides): Promise<BigNumber>;
-
-    DOMAIN_SEPARATOR(overrides?: CallOverrides): Promise<BigNumber>;
-  };
-
-  populateTransaction: {
-    nonces(
-      owner: string,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    DOMAIN_SEPARATOR(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-  };
-}
diff --git a/src/legacy/abis/types/Eip_2612.ts b/src/legacy/abis/types/Eip_2612.ts
deleted file mode 100644
index 4b364f41c4..0000000000
--- a/src/legacy/abis/types/Eip_2612.ts
+++ /dev/null
@@ -1,121 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-import type {
-  BaseContract,
-  BigNumber,
-  BytesLike,
-  CallOverrides,
-  PopulatedTransaction,
-  Signer,
-  utils,
-} from "ethers";
-import type { FunctionFragment, Result } from "@ethersproject/abi";
-import type { Listener, Provider } from "@ethersproject/providers";
-import type {
-  TypedEventFilter,
-  TypedEvent,
-  TypedListener,
-  OnEvent,
-  PromiseOrValue,
-} from "./common";
-
-export interface Eip_2612Interface extends utils.Interface {
-  functions: {
-    "nonces(address)": FunctionFragment;
-    "DOMAIN_SEPARATOR()": FunctionFragment;
-  };
-
-  getFunction(
-    nameOrSignatureOrTopic: "nonces" | "DOMAIN_SEPARATOR"
-  ): FunctionFragment;
-
-  encodeFunctionData(
-    functionFragment: "nonces",
-    values: [PromiseOrValue<string>]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "DOMAIN_SEPARATOR",
-    values?: undefined
-  ): string;
-
-  decodeFunctionResult(functionFragment: "nonces", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "DOMAIN_SEPARATOR",
-    data: BytesLike
-  ): Result;
-
-  events: {};
-}
-
-export interface Eip_2612 extends BaseContract {
-  connect(signerOrProvider: Signer | Provider | string): this;
-  attach(addressOrName: string): this;
-  deployed(): Promise<this>;
-
-  interface: Eip_2612Interface;
-
-  queryFilter<TEvent extends TypedEvent>(
-    event: TypedEventFilter<TEvent>,
-    fromBlockOrBlockhash?: string | number | undefined,
-    toBlock?: string | number | undefined
-  ): Promise<Array<TEvent>>;
-
-  listeners<TEvent extends TypedEvent>(
-    eventFilter?: TypedEventFilter<TEvent>
-  ): Array<TypedListener<TEvent>>;
-  listeners(eventName?: string): Array<Listener>;
-  removeAllListeners<TEvent extends TypedEvent>(
-    eventFilter: TypedEventFilter<TEvent>
-  ): this;
-  removeAllListeners(eventName?: string): this;
-  off: OnEvent<this>;
-  on: OnEvent<this>;
-  once: OnEvent<this>;
-  removeListener: OnEvent<this>;
-
-  functions: {
-    nonces(
-      owner: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<[BigNumber]>;
-
-    DOMAIN_SEPARATOR(overrides?: CallOverrides): Promise<[string]>;
-  };
-
-  nonces(
-    owner: PromiseOrValue<string>,
-    overrides?: CallOverrides
-  ): Promise<BigNumber>;
-
-  DOMAIN_SEPARATOR(overrides?: CallOverrides): Promise<string>;
-
-  callStatic: {
-    nonces(
-      owner: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    DOMAIN_SEPARATOR(overrides?: CallOverrides): Promise<string>;
-  };
-
-  filters: {};
-
-  estimateGas: {
-    nonces(
-      owner: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    DOMAIN_SEPARATOR(overrides?: CallOverrides): Promise<BigNumber>;
-  };
-
-  populateTransaction: {
-    nonces(
-      owner: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    DOMAIN_SEPARATOR(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-  };
-}
diff --git a/src/legacy/abis/types/EnsPublicResolver.d.ts b/src/legacy/abis/types/EnsPublicResolver.d.ts
deleted file mode 100644
index 8d58e2a59a..0000000000
--- a/src/legacy/abis/types/EnsPublicResolver.d.ts
+++ /dev/null
@@ -1,1132 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-
-import {
-  ethers,
-  EventFilter,
-  Signer,
-  BigNumber,
-  BigNumberish,
-  PopulatedTransaction,
-  BaseContract,
-  ContractTransaction,
-  Overrides,
-  CallOverrides,
-} from "ethers";
-import { BytesLike } from "@ethersproject/bytes";
-import { Listener, Provider } from "@ethersproject/providers";
-import { FunctionFragment, EventFragment, Result } from "@ethersproject/abi";
-import type { TypedEventFilter, TypedEvent, TypedListener } from "./common";
-
-interface EnsPublicResolverInterface extends ethers.utils.Interface {
-  functions: {
-    "ABI(bytes32,uint256)": FunctionFragment;
-    "addr(bytes32)": FunctionFragment;
-    "authorisations(bytes32,address,address)": FunctionFragment;
-    "clearDNSZone(bytes32)": FunctionFragment;
-    "contenthash(bytes32)": FunctionFragment;
-    "dnsRecord(bytes32,bytes32,uint16)": FunctionFragment;
-    "hasDNSRecords(bytes32,bytes32)": FunctionFragment;
-    "interfaceImplementer(bytes32,bytes4)": FunctionFragment;
-    "name(bytes32)": FunctionFragment;
-    "pubkey(bytes32)": FunctionFragment;
-    "setABI(bytes32,uint256,bytes)": FunctionFragment;
-    "setAddr(bytes32,uint256,bytes)": FunctionFragment;
-    "setAuthorisation(bytes32,address,bool)": FunctionFragment;
-    "setContenthash(bytes32,bytes)": FunctionFragment;
-    "setDNSRecords(bytes32,bytes)": FunctionFragment;
-    "setInterface(bytes32,bytes4,address)": FunctionFragment;
-    "setName(bytes32,string)": FunctionFragment;
-    "setPubkey(bytes32,bytes32,bytes32)": FunctionFragment;
-    "setText(bytes32,string,string)": FunctionFragment;
-    "supportsInterface(bytes4)": FunctionFragment;
-    "text(bytes32,string)": FunctionFragment;
-  };
-
-  encodeFunctionData(
-    functionFragment: "ABI",
-    values: [BytesLike, BigNumberish]
-  ): string;
-  encodeFunctionData(functionFragment: "addr", values: [BytesLike]): string;
-  encodeFunctionData(
-    functionFragment: "authorisations",
-    values: [BytesLike, string, string]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "clearDNSZone",
-    values: [BytesLike]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "contenthash",
-    values: [BytesLike]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "dnsRecord",
-    values: [BytesLike, BytesLike, BigNumberish]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "hasDNSRecords",
-    values: [BytesLike, BytesLike]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "interfaceImplementer",
-    values: [BytesLike, BytesLike]
-  ): string;
-  encodeFunctionData(functionFragment: "name", values: [BytesLike]): string;
-  encodeFunctionData(functionFragment: "pubkey", values: [BytesLike]): string;
-  encodeFunctionData(
-    functionFragment: "setABI",
-    values: [BytesLike, BigNumberish, BytesLike]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "setAddr",
-    values: [BytesLike, BigNumberish, BytesLike]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "setAuthorisation",
-    values: [BytesLike, string, boolean]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "setContenthash",
-    values: [BytesLike, BytesLike]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "setDNSRecords",
-    values: [BytesLike, BytesLike]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "setInterface",
-    values: [BytesLike, BytesLike, string]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "setName",
-    values: [BytesLike, string]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "setPubkey",
-    values: [BytesLike, BytesLike, BytesLike]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "setText",
-    values: [BytesLike, string, string]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "supportsInterface",
-    values: [BytesLike]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "text",
-    values: [BytesLike, string]
-  ): string;
-
-  decodeFunctionResult(functionFragment: "ABI", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "addr", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "authorisations",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "clearDNSZone",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "contenthash",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "dnsRecord", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "hasDNSRecords",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "interfaceImplementer",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "name", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "pubkey", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "setABI", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "setAddr", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "setAuthorisation",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "setContenthash",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "setDNSRecords",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "setInterface",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "setName", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "setPubkey", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "setText", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "supportsInterface",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "text", data: BytesLike): Result;
-
-  events: {
-    "ABIChanged(bytes32,uint256)": EventFragment;
-    "AddrChanged(bytes32,address)": EventFragment;
-    "AddressChanged(bytes32,uint256,bytes)": EventFragment;
-    "AuthorisationChanged(bytes32,address,address,bool)": EventFragment;
-    "ContenthashChanged(bytes32,bytes)": EventFragment;
-    "DNSRecordChanged(bytes32,bytes,uint16,bytes)": EventFragment;
-    "DNSRecordDeleted(bytes32,bytes,uint16)": EventFragment;
-    "DNSZoneCleared(bytes32)": EventFragment;
-    "InterfaceChanged(bytes32,bytes4,address)": EventFragment;
-    "NameChanged(bytes32,string)": EventFragment;
-    "PubkeyChanged(bytes32,bytes32,bytes32)": EventFragment;
-    "TextChanged(bytes32,string,string)": EventFragment;
-  };
-
-  getEvent(nameOrSignatureOrTopic: "ABIChanged"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "AddrChanged"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "AddressChanged"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "AuthorisationChanged"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "ContenthashChanged"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "DNSRecordChanged"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "DNSRecordDeleted"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "DNSZoneCleared"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "InterfaceChanged"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "NameChanged"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "PubkeyChanged"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "TextChanged"): EventFragment;
-}
-
-export type ABIChangedEvent = TypedEvent<
-  [string, BigNumber] & { node: string; contentType: BigNumber }
->;
-
-export type AddrChangedEvent = TypedEvent<
-  [string, string] & { node: string; a: string }
->;
-
-export type AddressChangedEvent = TypedEvent<
-  [string, BigNumber, string] & {
-    node: string;
-    coinType: BigNumber;
-    newAddress: string;
-  }
->;
-
-export type AuthorisationChangedEvent = TypedEvent<
-  [string, string, string, boolean] & {
-    node: string;
-    owner: string;
-    target: string;
-    isAuthorised: boolean;
-  }
->;
-
-export type ContenthashChangedEvent = TypedEvent<
-  [string, string] & { node: string; hash: string }
->;
-
-export type DNSRecordChangedEvent = TypedEvent<
-  [string, string, number, string] & {
-    node: string;
-    name: string;
-    resource: number;
-    record: string;
-  }
->;
-
-export type DNSRecordDeletedEvent = TypedEvent<
-  [string, string, number] & { node: string; name: string; resource: number }
->;
-
-export type DNSZoneClearedEvent = TypedEvent<[string] & { node: string }>;
-
-export type InterfaceChangedEvent = TypedEvent<
-  [string, string, string] & {
-    node: string;
-    interfaceID: string;
-    implementer: string;
-  }
->;
-
-export type NameChangedEvent = TypedEvent<
-  [string, string] & { node: string; name: string }
->;
-
-export type PubkeyChangedEvent = TypedEvent<
-  [string, string, string] & { node: string; x: string; y: string }
->;
-
-export type TextChangedEvent = TypedEvent<
-  [string, string, string] & { node: string; indexedKey: string; key: string }
->;
-
-export class EnsPublicResolver extends BaseContract {
-  connect(signerOrProvider: Signer | Provider | string): this;
-  attach(addressOrName: string): this;
-  deployed(): Promise<this>;
-
-  listeners<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter?: TypedEventFilter<EventArgsArray, EventArgsObject>
-  ): Array<TypedListener<EventArgsArray, EventArgsObject>>;
-  off<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    listener: TypedListener<EventArgsArray, EventArgsObject>
-  ): this;
-  on<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    listener: TypedListener<EventArgsArray, EventArgsObject>
-  ): this;
-  once<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    listener: TypedListener<EventArgsArray, EventArgsObject>
-  ): this;
-  removeListener<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    listener: TypedListener<EventArgsArray, EventArgsObject>
-  ): this;
-  removeAllListeners<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>
-  ): this;
-
-  listeners(eventName?: string): Array<Listener>;
-  off(eventName: string, listener: Listener): this;
-  on(eventName: string, listener: Listener): this;
-  once(eventName: string, listener: Listener): this;
-  removeListener(eventName: string, listener: Listener): this;
-  removeAllListeners(eventName?: string): this;
-
-  queryFilter<EventArgsArray extends Array<any>, EventArgsObject>(
-    event: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    fromBlockOrBlockhash?: string | number | undefined,
-    toBlock?: string | number | undefined
-  ): Promise<Array<TypedEvent<EventArgsArray & EventArgsObject>>>;
-
-  interface: EnsPublicResolverInterface;
-
-  functions: {
-    ABI(
-      node: BytesLike,
-      contentTypes: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<[BigNumber, string]>;
-
-    addr(node: BytesLike, overrides?: CallOverrides): Promise<[string]>;
-
-    authorisations(
-      arg0: BytesLike,
-      arg1: string,
-      arg2: string,
-      overrides?: CallOverrides
-    ): Promise<[boolean]>;
-
-    clearDNSZone(
-      node: BytesLike,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    contenthash(node: BytesLike, overrides?: CallOverrides): Promise<[string]>;
-
-    dnsRecord(
-      node: BytesLike,
-      name: BytesLike,
-      resource: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<[string]>;
-
-    hasDNSRecords(
-      node: BytesLike,
-      name: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<[boolean]>;
-
-    interfaceImplementer(
-      node: BytesLike,
-      interfaceID: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<[string]>;
-
-    name(node: BytesLike, overrides?: CallOverrides): Promise<[string]>;
-
-    pubkey(
-      node: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<[string, string] & { x: string; y: string }>;
-
-    setABI(
-      node: BytesLike,
-      contentType: BigNumberish,
-      data: BytesLike,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    "setAddr(bytes32,uint256,bytes)"(
-      node: BytesLike,
-      coinType: BigNumberish,
-      a: BytesLike,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    "setAddr(bytes32,address)"(
-      node: BytesLike,
-      a: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    setAuthorisation(
-      node: BytesLike,
-      target: string,
-      isAuthorised: boolean,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    setContenthash(
-      node: BytesLike,
-      hash: BytesLike,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    setDNSRecords(
-      node: BytesLike,
-      data: BytesLike,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    setInterface(
-      node: BytesLike,
-      interfaceID: BytesLike,
-      implementer: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    setName(
-      node: BytesLike,
-      name: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    setPubkey(
-      node: BytesLike,
-      x: BytesLike,
-      y: BytesLike,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    setText(
-      node: BytesLike,
-      key: string,
-      value: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    supportsInterface(
-      interfaceID: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<[boolean]>;
-
-    text(
-      node: BytesLike,
-      key: string,
-      overrides?: CallOverrides
-    ): Promise<[string]>;
-  };
-
-  ABI(
-    node: BytesLike,
-    contentTypes: BigNumberish,
-    overrides?: CallOverrides
-  ): Promise<[BigNumber, string]>;
-
-  addr(node: BytesLike, overrides?: CallOverrides): Promise<string>;
-
-  authorisations(
-    arg0: BytesLike,
-    arg1: string,
-    arg2: string,
-    overrides?: CallOverrides
-  ): Promise<boolean>;
-
-  clearDNSZone(
-    node: BytesLike,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  contenthash(node: BytesLike, overrides?: CallOverrides): Promise<string>;
-
-  dnsRecord(
-    node: BytesLike,
-    name: BytesLike,
-    resource: BigNumberish,
-    overrides?: CallOverrides
-  ): Promise<string>;
-
-  hasDNSRecords(
-    node: BytesLike,
-    name: BytesLike,
-    overrides?: CallOverrides
-  ): Promise<boolean>;
-
-  interfaceImplementer(
-    node: BytesLike,
-    interfaceID: BytesLike,
-    overrides?: CallOverrides
-  ): Promise<string>;
-
-  name(node: BytesLike, overrides?: CallOverrides): Promise<string>;
-
-  pubkey(
-    node: BytesLike,
-    overrides?: CallOverrides
-  ): Promise<[string, string] & { x: string; y: string }>;
-
-  setABI(
-    node: BytesLike,
-    contentType: BigNumberish,
-    data: BytesLike,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  "setAddr(bytes32,uint256,bytes)"(
-    node: BytesLike,
-    coinType: BigNumberish,
-    a: BytesLike,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  "setAddr(bytes32,address)"(
-    node: BytesLike,
-    a: string,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  setAuthorisation(
-    node: BytesLike,
-    target: string,
-    isAuthorised: boolean,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  setContenthash(
-    node: BytesLike,
-    hash: BytesLike,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  setDNSRecords(
-    node: BytesLike,
-    data: BytesLike,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  setInterface(
-    node: BytesLike,
-    interfaceID: BytesLike,
-    implementer: string,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  setName(
-    node: BytesLike,
-    name: string,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  setPubkey(
-    node: BytesLike,
-    x: BytesLike,
-    y: BytesLike,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  setText(
-    node: BytesLike,
-    key: string,
-    value: string,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  supportsInterface(
-    interfaceID: BytesLike,
-    overrides?: CallOverrides
-  ): Promise<boolean>;
-
-  text(
-    node: BytesLike,
-    key: string,
-    overrides?: CallOverrides
-  ): Promise<string>;
-
-  callStatic: {
-    ABI(
-      node: BytesLike,
-      contentTypes: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<[BigNumber, string]>;
-
-    addr(node: BytesLike, overrides?: CallOverrides): Promise<string>;
-
-    authorisations(
-      arg0: BytesLike,
-      arg1: string,
-      arg2: string,
-      overrides?: CallOverrides
-    ): Promise<boolean>;
-
-    clearDNSZone(node: BytesLike, overrides?: CallOverrides): Promise<void>;
-
-    contenthash(node: BytesLike, overrides?: CallOverrides): Promise<string>;
-
-    dnsRecord(
-      node: BytesLike,
-      name: BytesLike,
-      resource: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<string>;
-
-    hasDNSRecords(
-      node: BytesLike,
-      name: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<boolean>;
-
-    interfaceImplementer(
-      node: BytesLike,
-      interfaceID: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<string>;
-
-    name(node: BytesLike, overrides?: CallOverrides): Promise<string>;
-
-    pubkey(
-      node: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<[string, string] & { x: string; y: string }>;
-
-    setABI(
-      node: BytesLike,
-      contentType: BigNumberish,
-      data: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    "setAddr(bytes32,uint256,bytes)"(
-      node: BytesLike,
-      coinType: BigNumberish,
-      a: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    "setAddr(bytes32,address)"(
-      node: BytesLike,
-      a: string,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    setAuthorisation(
-      node: BytesLike,
-      target: string,
-      isAuthorised: boolean,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    setContenthash(
-      node: BytesLike,
-      hash: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    setDNSRecords(
-      node: BytesLike,
-      data: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    setInterface(
-      node: BytesLike,
-      interfaceID: BytesLike,
-      implementer: string,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    setName(
-      node: BytesLike,
-      name: string,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    setPubkey(
-      node: BytesLike,
-      x: BytesLike,
-      y: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    setText(
-      node: BytesLike,
-      key: string,
-      value: string,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    supportsInterface(
-      interfaceID: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<boolean>;
-
-    text(
-      node: BytesLike,
-      key: string,
-      overrides?: CallOverrides
-    ): Promise<string>;
-  };
-
-  filters: {
-    "ABIChanged(bytes32,uint256)"(
-      node?: BytesLike | null,
-      contentType?: BigNumberish | null
-    ): TypedEventFilter<
-      [string, BigNumber],
-      { node: string; contentType: BigNumber }
-    >;
-
-    ABIChanged(
-      node?: BytesLike | null,
-      contentType?: BigNumberish | null
-    ): TypedEventFilter<
-      [string, BigNumber],
-      { node: string; contentType: BigNumber }
-    >;
-
-    "AddrChanged(bytes32,address)"(
-      node?: BytesLike | null,
-      a?: null
-    ): TypedEventFilter<[string, string], { node: string; a: string }>;
-
-    AddrChanged(
-      node?: BytesLike | null,
-      a?: null
-    ): TypedEventFilter<[string, string], { node: string; a: string }>;
-
-    "AddressChanged(bytes32,uint256,bytes)"(
-      node?: BytesLike | null,
-      coinType?: null,
-      newAddress?: null
-    ): TypedEventFilter<
-      [string, BigNumber, string],
-      { node: string; coinType: BigNumber; newAddress: string }
-    >;
-
-    AddressChanged(
-      node?: BytesLike | null,
-      coinType?: null,
-      newAddress?: null
-    ): TypedEventFilter<
-      [string, BigNumber, string],
-      { node: string; coinType: BigNumber; newAddress: string }
-    >;
-
-    "AuthorisationChanged(bytes32,address,address,bool)"(
-      node?: BytesLike | null,
-      owner?: string | null,
-      target?: string | null,
-      isAuthorised?: null
-    ): TypedEventFilter<
-      [string, string, string, boolean],
-      { node: string; owner: string; target: string; isAuthorised: boolean }
-    >;
-
-    AuthorisationChanged(
-      node?: BytesLike | null,
-      owner?: string | null,
-      target?: string | null,
-      isAuthorised?: null
-    ): TypedEventFilter<
-      [string, string, string, boolean],
-      { node: string; owner: string; target: string; isAuthorised: boolean }
-    >;
-
-    "ContenthashChanged(bytes32,bytes)"(
-      node?: BytesLike | null,
-      hash?: null
-    ): TypedEventFilter<[string, string], { node: string; hash: string }>;
-
-    ContenthashChanged(
-      node?: BytesLike | null,
-      hash?: null
-    ): TypedEventFilter<[string, string], { node: string; hash: string }>;
-
-    "DNSRecordChanged(bytes32,bytes,uint16,bytes)"(
-      node?: BytesLike | null,
-      name?: null,
-      resource?: null,
-      record?: null
-    ): TypedEventFilter<
-      [string, string, number, string],
-      { node: string; name: string; resource: number; record: string }
-    >;
-
-    DNSRecordChanged(
-      node?: BytesLike | null,
-      name?: null,
-      resource?: null,
-      record?: null
-    ): TypedEventFilter<
-      [string, string, number, string],
-      { node: string; name: string; resource: number; record: string }
-    >;
-
-    "DNSRecordDeleted(bytes32,bytes,uint16)"(
-      node?: BytesLike | null,
-      name?: null,
-      resource?: null
-    ): TypedEventFilter<
-      [string, string, number],
-      { node: string; name: string; resource: number }
-    >;
-
-    DNSRecordDeleted(
-      node?: BytesLike | null,
-      name?: null,
-      resource?: null
-    ): TypedEventFilter<
-      [string, string, number],
-      { node: string; name: string; resource: number }
-    >;
-
-    "DNSZoneCleared(bytes32)"(
-      node?: BytesLike | null
-    ): TypedEventFilter<[string], { node: string }>;
-
-    DNSZoneCleared(
-      node?: BytesLike | null
-    ): TypedEventFilter<[string], { node: string }>;
-
-    "InterfaceChanged(bytes32,bytes4,address)"(
-      node?: BytesLike | null,
-      interfaceID?: BytesLike | null,
-      implementer?: null
-    ): TypedEventFilter<
-      [string, string, string],
-      { node: string; interfaceID: string; implementer: string }
-    >;
-
-    InterfaceChanged(
-      node?: BytesLike | null,
-      interfaceID?: BytesLike | null,
-      implementer?: null
-    ): TypedEventFilter<
-      [string, string, string],
-      { node: string; interfaceID: string; implementer: string }
-    >;
-
-    "NameChanged(bytes32,string)"(
-      node?: BytesLike | null,
-      name?: null
-    ): TypedEventFilter<[string, string], { node: string; name: string }>;
-
-    NameChanged(
-      node?: BytesLike | null,
-      name?: null
-    ): TypedEventFilter<[string, string], { node: string; name: string }>;
-
-    "PubkeyChanged(bytes32,bytes32,bytes32)"(
-      node?: BytesLike | null,
-      x?: null,
-      y?: null
-    ): TypedEventFilter<
-      [string, string, string],
-      { node: string; x: string; y: string }
-    >;
-
-    PubkeyChanged(
-      node?: BytesLike | null,
-      x?: null,
-      y?: null
-    ): TypedEventFilter<
-      [string, string, string],
-      { node: string; x: string; y: string }
-    >;
-
-    "TextChanged(bytes32,string,string)"(
-      node?: BytesLike | null,
-      indexedKey?: string | null,
-      key?: null
-    ): TypedEventFilter<
-      [string, string, string],
-      { node: string; indexedKey: string; key: string }
-    >;
-
-    TextChanged(
-      node?: BytesLike | null,
-      indexedKey?: string | null,
-      key?: null
-    ): TypedEventFilter<
-      [string, string, string],
-      { node: string; indexedKey: string; key: string }
-    >;
-  };
-
-  estimateGas: {
-    ABI(
-      node: BytesLike,
-      contentTypes: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    addr(node: BytesLike, overrides?: CallOverrides): Promise<BigNumber>;
-
-    authorisations(
-      arg0: BytesLike,
-      arg1: string,
-      arg2: string,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    clearDNSZone(
-      node: BytesLike,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    contenthash(node: BytesLike, overrides?: CallOverrides): Promise<BigNumber>;
-
-    dnsRecord(
-      node: BytesLike,
-      name: BytesLike,
-      resource: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    hasDNSRecords(
-      node: BytesLike,
-      name: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    interfaceImplementer(
-      node: BytesLike,
-      interfaceID: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    name(node: BytesLike, overrides?: CallOverrides): Promise<BigNumber>;
-
-    pubkey(node: BytesLike, overrides?: CallOverrides): Promise<BigNumber>;
-
-    setABI(
-      node: BytesLike,
-      contentType: BigNumberish,
-      data: BytesLike,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    "setAddr(bytes32,uint256,bytes)"(
-      node: BytesLike,
-      coinType: BigNumberish,
-      a: BytesLike,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    "setAddr(bytes32,address)"(
-      node: BytesLike,
-      a: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    setAuthorisation(
-      node: BytesLike,
-      target: string,
-      isAuthorised: boolean,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    setContenthash(
-      node: BytesLike,
-      hash: BytesLike,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    setDNSRecords(
-      node: BytesLike,
-      data: BytesLike,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    setInterface(
-      node: BytesLike,
-      interfaceID: BytesLike,
-      implementer: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    setName(
-      node: BytesLike,
-      name: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    setPubkey(
-      node: BytesLike,
-      x: BytesLike,
-      y: BytesLike,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    setText(
-      node: BytesLike,
-      key: string,
-      value: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    supportsInterface(
-      interfaceID: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    text(
-      node: BytesLike,
-      key: string,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-  };
-
-  populateTransaction: {
-    ABI(
-      node: BytesLike,
-      contentTypes: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    addr(
-      node: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    authorisations(
-      arg0: BytesLike,
-      arg1: string,
-      arg2: string,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    clearDNSZone(
-      node: BytesLike,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    contenthash(
-      node: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    dnsRecord(
-      node: BytesLike,
-      name: BytesLike,
-      resource: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    hasDNSRecords(
-      node: BytesLike,
-      name: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    interfaceImplementer(
-      node: BytesLike,
-      interfaceID: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    name(
-      node: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    pubkey(
-      node: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    setABI(
-      node: BytesLike,
-      contentType: BigNumberish,
-      data: BytesLike,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    "setAddr(bytes32,uint256,bytes)"(
-      node: BytesLike,
-      coinType: BigNumberish,
-      a: BytesLike,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    "setAddr(bytes32,address)"(
-      node: BytesLike,
-      a: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    setAuthorisation(
-      node: BytesLike,
-      target: string,
-      isAuthorised: boolean,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    setContenthash(
-      node: BytesLike,
-      hash: BytesLike,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    setDNSRecords(
-      node: BytesLike,
-      data: BytesLike,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    setInterface(
-      node: BytesLike,
-      interfaceID: BytesLike,
-      implementer: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    setName(
-      node: BytesLike,
-      name: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    setPubkey(
-      node: BytesLike,
-      x: BytesLike,
-      y: BytesLike,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    setText(
-      node: BytesLike,
-      key: string,
-      value: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    supportsInterface(
-      interfaceID: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    text(
-      node: BytesLike,
-      key: string,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-  };
-}
diff --git a/src/legacy/abis/types/EnsPublicResolver.ts b/src/legacy/abis/types/EnsPublicResolver.ts
deleted file mode 100644
index 4db0fdd969..0000000000
--- a/src/legacy/abis/types/EnsPublicResolver.ts
+++ /dev/null
@@ -1,1265 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-import type {
-  BaseContract,
-  BigNumber,
-  BigNumberish,
-  BytesLike,
-  CallOverrides,
-  ContractTransaction,
-  Overrides,
-  PopulatedTransaction,
-  Signer,
-  utils,
-} from "ethers";
-import type {
-  FunctionFragment,
-  Result,
-  EventFragment,
-} from "@ethersproject/abi";
-import type { Listener, Provider } from "@ethersproject/providers";
-import type {
-  TypedEventFilter,
-  TypedEvent,
-  TypedListener,
-  OnEvent,
-  PromiseOrValue,
-} from "./common";
-
-export interface EnsPublicResolverInterface extends utils.Interface {
-  functions: {
-    "ABI(bytes32,uint256)": FunctionFragment;
-    "addr(bytes32)": FunctionFragment;
-    "authorisations(bytes32,address,address)": FunctionFragment;
-    "clearDNSZone(bytes32)": FunctionFragment;
-    "contenthash(bytes32)": FunctionFragment;
-    "dnsRecord(bytes32,bytes32,uint16)": FunctionFragment;
-    "hasDNSRecords(bytes32,bytes32)": FunctionFragment;
-    "interfaceImplementer(bytes32,bytes4)": FunctionFragment;
-    "name(bytes32)": FunctionFragment;
-    "pubkey(bytes32)": FunctionFragment;
-    "setABI(bytes32,uint256,bytes)": FunctionFragment;
-    "setAddr(bytes32,uint256,bytes)": FunctionFragment;
-    "setAddr(bytes32,address)": FunctionFragment;
-    "setAuthorisation(bytes32,address,bool)": FunctionFragment;
-    "setContenthash(bytes32,bytes)": FunctionFragment;
-    "setDNSRecords(bytes32,bytes)": FunctionFragment;
-    "setInterface(bytes32,bytes4,address)": FunctionFragment;
-    "setName(bytes32,string)": FunctionFragment;
-    "setPubkey(bytes32,bytes32,bytes32)": FunctionFragment;
-    "setText(bytes32,string,string)": FunctionFragment;
-    "supportsInterface(bytes4)": FunctionFragment;
-    "text(bytes32,string)": FunctionFragment;
-  };
-
-  getFunction(
-    nameOrSignatureOrTopic:
-      | "ABI"
-      | "addr"
-      | "authorisations"
-      | "clearDNSZone"
-      | "contenthash"
-      | "dnsRecord"
-      | "hasDNSRecords"
-      | "interfaceImplementer"
-      | "name"
-      | "pubkey"
-      | "setABI"
-      | "setAddr(bytes32,uint256,bytes)"
-      | "setAddr(bytes32,address)"
-      | "setAuthorisation"
-      | "setContenthash"
-      | "setDNSRecords"
-      | "setInterface"
-      | "setName"
-      | "setPubkey"
-      | "setText"
-      | "supportsInterface"
-      | "text"
-  ): FunctionFragment;
-
-  encodeFunctionData(
-    functionFragment: "ABI",
-    values: [PromiseOrValue<BytesLike>, PromiseOrValue<BigNumberish>]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "addr",
-    values: [PromiseOrValue<BytesLike>]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "authorisations",
-    values: [
-      PromiseOrValue<BytesLike>,
-      PromiseOrValue<string>,
-      PromiseOrValue<string>
-    ]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "clearDNSZone",
-    values: [PromiseOrValue<BytesLike>]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "contenthash",
-    values: [PromiseOrValue<BytesLike>]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "dnsRecord",
-    values: [
-      PromiseOrValue<BytesLike>,
-      PromiseOrValue<BytesLike>,
-      PromiseOrValue<BigNumberish>
-    ]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "hasDNSRecords",
-    values: [PromiseOrValue<BytesLike>, PromiseOrValue<BytesLike>]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "interfaceImplementer",
-    values: [PromiseOrValue<BytesLike>, PromiseOrValue<BytesLike>]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "name",
-    values: [PromiseOrValue<BytesLike>]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "pubkey",
-    values: [PromiseOrValue<BytesLike>]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "setABI",
-    values: [
-      PromiseOrValue<BytesLike>,
-      PromiseOrValue<BigNumberish>,
-      PromiseOrValue<BytesLike>
-    ]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "setAddr(bytes32,uint256,bytes)",
-    values: [
-      PromiseOrValue<BytesLike>,
-      PromiseOrValue<BigNumberish>,
-      PromiseOrValue<BytesLike>
-    ]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "setAddr(bytes32,address)",
-    values: [PromiseOrValue<BytesLike>, PromiseOrValue<string>]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "setAuthorisation",
-    values: [
-      PromiseOrValue<BytesLike>,
-      PromiseOrValue<string>,
-      PromiseOrValue<boolean>
-    ]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "setContenthash",
-    values: [PromiseOrValue<BytesLike>, PromiseOrValue<BytesLike>]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "setDNSRecords",
-    values: [PromiseOrValue<BytesLike>, PromiseOrValue<BytesLike>]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "setInterface",
-    values: [
-      PromiseOrValue<BytesLike>,
-      PromiseOrValue<BytesLike>,
-      PromiseOrValue<string>
-    ]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "setName",
-    values: [PromiseOrValue<BytesLike>, PromiseOrValue<string>]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "setPubkey",
-    values: [
-      PromiseOrValue<BytesLike>,
-      PromiseOrValue<BytesLike>,
-      PromiseOrValue<BytesLike>
-    ]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "setText",
-    values: [
-      PromiseOrValue<BytesLike>,
-      PromiseOrValue<string>,
-      PromiseOrValue<string>
-    ]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "supportsInterface",
-    values: [PromiseOrValue<BytesLike>]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "text",
-    values: [PromiseOrValue<BytesLike>, PromiseOrValue<string>]
-  ): string;
-
-  decodeFunctionResult(functionFragment: "ABI", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "addr", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "authorisations",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "clearDNSZone",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "contenthash",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "dnsRecord", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "hasDNSRecords",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "interfaceImplementer",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "name", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "pubkey", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "setABI", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "setAddr(bytes32,uint256,bytes)",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "setAddr(bytes32,address)",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "setAuthorisation",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "setContenthash",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "setDNSRecords",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "setInterface",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "setName", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "setPubkey", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "setText", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "supportsInterface",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "text", data: BytesLike): Result;
-
-  events: {
-    "ABIChanged(bytes32,uint256)": EventFragment;
-    "AddrChanged(bytes32,address)": EventFragment;
-    "AddressChanged(bytes32,uint256,bytes)": EventFragment;
-    "AuthorisationChanged(bytes32,address,address,bool)": EventFragment;
-    "ContenthashChanged(bytes32,bytes)": EventFragment;
-    "DNSRecordChanged(bytes32,bytes,uint16,bytes)": EventFragment;
-    "DNSRecordDeleted(bytes32,bytes,uint16)": EventFragment;
-    "DNSZoneCleared(bytes32)": EventFragment;
-    "InterfaceChanged(bytes32,bytes4,address)": EventFragment;
-    "NameChanged(bytes32,string)": EventFragment;
-    "PubkeyChanged(bytes32,bytes32,bytes32)": EventFragment;
-    "TextChanged(bytes32,string,string)": EventFragment;
-  };
-
-  getEvent(nameOrSignatureOrTopic: "ABIChanged"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "AddrChanged"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "AddressChanged"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "AuthorisationChanged"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "ContenthashChanged"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "DNSRecordChanged"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "DNSRecordDeleted"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "DNSZoneCleared"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "InterfaceChanged"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "NameChanged"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "PubkeyChanged"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "TextChanged"): EventFragment;
-}
-
-export interface ABIChangedEventObject {
-  node: string;
-  contentType: BigNumber;
-}
-export type ABIChangedEvent = TypedEvent<
-  [string, BigNumber],
-  ABIChangedEventObject
->;
-
-export type ABIChangedEventFilter = TypedEventFilter<ABIChangedEvent>;
-
-export interface AddrChangedEventObject {
-  node: string;
-  a: string;
-}
-export type AddrChangedEvent = TypedEvent<
-  [string, string],
-  AddrChangedEventObject
->;
-
-export type AddrChangedEventFilter = TypedEventFilter<AddrChangedEvent>;
-
-export interface AddressChangedEventObject {
-  node: string;
-  coinType: BigNumber;
-  newAddress: string;
-}
-export type AddressChangedEvent = TypedEvent<
-  [string, BigNumber, string],
-  AddressChangedEventObject
->;
-
-export type AddressChangedEventFilter = TypedEventFilter<AddressChangedEvent>;
-
-export interface AuthorisationChangedEventObject {
-  node: string;
-  owner: string;
-  target: string;
-  isAuthorised: boolean;
-}
-export type AuthorisationChangedEvent = TypedEvent<
-  [string, string, string, boolean],
-  AuthorisationChangedEventObject
->;
-
-export type AuthorisationChangedEventFilter =
-  TypedEventFilter<AuthorisationChangedEvent>;
-
-export interface ContenthashChangedEventObject {
-  node: string;
-  hash: string;
-}
-export type ContenthashChangedEvent = TypedEvent<
-  [string, string],
-  ContenthashChangedEventObject
->;
-
-export type ContenthashChangedEventFilter =
-  TypedEventFilter<ContenthashChangedEvent>;
-
-export interface DNSRecordChangedEventObject {
-  node: string;
-  name: string;
-  resource: number;
-  record: string;
-}
-export type DNSRecordChangedEvent = TypedEvent<
-  [string, string, number, string],
-  DNSRecordChangedEventObject
->;
-
-export type DNSRecordChangedEventFilter =
-  TypedEventFilter<DNSRecordChangedEvent>;
-
-export interface DNSRecordDeletedEventObject {
-  node: string;
-  name: string;
-  resource: number;
-}
-export type DNSRecordDeletedEvent = TypedEvent<
-  [string, string, number],
-  DNSRecordDeletedEventObject
->;
-
-export type DNSRecordDeletedEventFilter =
-  TypedEventFilter<DNSRecordDeletedEvent>;
-
-export interface DNSZoneClearedEventObject {
-  node: string;
-}
-export type DNSZoneClearedEvent = TypedEvent<
-  [string],
-  DNSZoneClearedEventObject
->;
-
-export type DNSZoneClearedEventFilter = TypedEventFilter<DNSZoneClearedEvent>;
-
-export interface InterfaceChangedEventObject {
-  node: string;
-  interfaceID: string;
-  implementer: string;
-}
-export type InterfaceChangedEvent = TypedEvent<
-  [string, string, string],
-  InterfaceChangedEventObject
->;
-
-export type InterfaceChangedEventFilter =
-  TypedEventFilter<InterfaceChangedEvent>;
-
-export interface NameChangedEventObject {
-  node: string;
-  name: string;
-}
-export type NameChangedEvent = TypedEvent<
-  [string, string],
-  NameChangedEventObject
->;
-
-export type NameChangedEventFilter = TypedEventFilter<NameChangedEvent>;
-
-export interface PubkeyChangedEventObject {
-  node: string;
-  x: string;
-  y: string;
-}
-export type PubkeyChangedEvent = TypedEvent<
-  [string, string, string],
-  PubkeyChangedEventObject
->;
-
-export type PubkeyChangedEventFilter = TypedEventFilter<PubkeyChangedEvent>;
-
-export interface TextChangedEventObject {
-  node: string;
-  indexedKey: string;
-  key: string;
-}
-export type TextChangedEvent = TypedEvent<
-  [string, string, string],
-  TextChangedEventObject
->;
-
-export type TextChangedEventFilter = TypedEventFilter<TextChangedEvent>;
-
-export interface EnsPublicResolver extends BaseContract {
-  connect(signerOrProvider: Signer | Provider | string): this;
-  attach(addressOrName: string): this;
-  deployed(): Promise<this>;
-
-  interface: EnsPublicResolverInterface;
-
-  queryFilter<TEvent extends TypedEvent>(
-    event: TypedEventFilter<TEvent>,
-    fromBlockOrBlockhash?: string | number | undefined,
-    toBlock?: string | number | undefined
-  ): Promise<Array<TEvent>>;
-
-  listeners<TEvent extends TypedEvent>(
-    eventFilter?: TypedEventFilter<TEvent>
-  ): Array<TypedListener<TEvent>>;
-  listeners(eventName?: string): Array<Listener>;
-  removeAllListeners<TEvent extends TypedEvent>(
-    eventFilter: TypedEventFilter<TEvent>
-  ): this;
-  removeAllListeners(eventName?: string): this;
-  off: OnEvent<this>;
-  on: OnEvent<this>;
-  once: OnEvent<this>;
-  removeListener: OnEvent<this>;
-
-  functions: {
-    ABI(
-      node: PromiseOrValue<BytesLike>,
-      contentTypes: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<[BigNumber, string]>;
-
-    addr(
-      node: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<[string]>;
-
-    authorisations(
-      arg0: PromiseOrValue<BytesLike>,
-      arg1: PromiseOrValue<string>,
-      arg2: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<[boolean]>;
-
-    clearDNSZone(
-      node: PromiseOrValue<BytesLike>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<ContractTransaction>;
-
-    contenthash(
-      node: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<[string]>;
-
-    dnsRecord(
-      node: PromiseOrValue<BytesLike>,
-      name: PromiseOrValue<BytesLike>,
-      resource: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<[string]>;
-
-    hasDNSRecords(
-      node: PromiseOrValue<BytesLike>,
-      name: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<[boolean]>;
-
-    interfaceImplementer(
-      node: PromiseOrValue<BytesLike>,
-      interfaceID: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<[string]>;
-
-    name(
-      node: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<[string]>;
-
-    pubkey(
-      node: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<[string, string] & { x: string; y: string }>;
-
-    setABI(
-      node: PromiseOrValue<BytesLike>,
-      contentType: PromiseOrValue<BigNumberish>,
-      data: PromiseOrValue<BytesLike>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<ContractTransaction>;
-
-    "setAddr(bytes32,uint256,bytes)"(
-      node: PromiseOrValue<BytesLike>,
-      coinType: PromiseOrValue<BigNumberish>,
-      a: PromiseOrValue<BytesLike>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<ContractTransaction>;
-
-    "setAddr(bytes32,address)"(
-      node: PromiseOrValue<BytesLike>,
-      a: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<ContractTransaction>;
-
-    setAuthorisation(
-      node: PromiseOrValue<BytesLike>,
-      target: PromiseOrValue<string>,
-      isAuthorised: PromiseOrValue<boolean>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<ContractTransaction>;
-
-    setContenthash(
-      node: PromiseOrValue<BytesLike>,
-      hash: PromiseOrValue<BytesLike>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<ContractTransaction>;
-
-    setDNSRecords(
-      node: PromiseOrValue<BytesLike>,
-      data: PromiseOrValue<BytesLike>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<ContractTransaction>;
-
-    setInterface(
-      node: PromiseOrValue<BytesLike>,
-      interfaceID: PromiseOrValue<BytesLike>,
-      implementer: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<ContractTransaction>;
-
-    setName(
-      node: PromiseOrValue<BytesLike>,
-      name: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<ContractTransaction>;
-
-    setPubkey(
-      node: PromiseOrValue<BytesLike>,
-      x: PromiseOrValue<BytesLike>,
-      y: PromiseOrValue<BytesLike>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<ContractTransaction>;
-
-    setText(
-      node: PromiseOrValue<BytesLike>,
-      key: PromiseOrValue<string>,
-      value: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<ContractTransaction>;
-
-    supportsInterface(
-      interfaceID: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<[boolean]>;
-
-    text(
-      node: PromiseOrValue<BytesLike>,
-      key: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<[string]>;
-  };
-
-  ABI(
-    node: PromiseOrValue<BytesLike>,
-    contentTypes: PromiseOrValue<BigNumberish>,
-    overrides?: CallOverrides
-  ): Promise<[BigNumber, string]>;
-
-  addr(
-    node: PromiseOrValue<BytesLike>,
-    overrides?: CallOverrides
-  ): Promise<string>;
-
-  authorisations(
-    arg0: PromiseOrValue<BytesLike>,
-    arg1: PromiseOrValue<string>,
-    arg2: PromiseOrValue<string>,
-    overrides?: CallOverrides
-  ): Promise<boolean>;
-
-  clearDNSZone(
-    node: PromiseOrValue<BytesLike>,
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
-  ): Promise<ContractTransaction>;
-
-  contenthash(
-    node: PromiseOrValue<BytesLike>,
-    overrides?: CallOverrides
-  ): Promise<string>;
-
-  dnsRecord(
-    node: PromiseOrValue<BytesLike>,
-    name: PromiseOrValue<BytesLike>,
-    resource: PromiseOrValue<BigNumberish>,
-    overrides?: CallOverrides
-  ): Promise<string>;
-
-  hasDNSRecords(
-    node: PromiseOrValue<BytesLike>,
-    name: PromiseOrValue<BytesLike>,
-    overrides?: CallOverrides
-  ): Promise<boolean>;
-
-  interfaceImplementer(
-    node: PromiseOrValue<BytesLike>,
-    interfaceID: PromiseOrValue<BytesLike>,
-    overrides?: CallOverrides
-  ): Promise<string>;
-
-  name(
-    node: PromiseOrValue<BytesLike>,
-    overrides?: CallOverrides
-  ): Promise<string>;
-
-  pubkey(
-    node: PromiseOrValue<BytesLike>,
-    overrides?: CallOverrides
-  ): Promise<[string, string] & { x: string; y: string }>;
-
-  setABI(
-    node: PromiseOrValue<BytesLike>,
-    contentType: PromiseOrValue<BigNumberish>,
-    data: PromiseOrValue<BytesLike>,
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
-  ): Promise<ContractTransaction>;
-
-  "setAddr(bytes32,uint256,bytes)"(
-    node: PromiseOrValue<BytesLike>,
-    coinType: PromiseOrValue<BigNumberish>,
-    a: PromiseOrValue<BytesLike>,
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
-  ): Promise<ContractTransaction>;
-
-  "setAddr(bytes32,address)"(
-    node: PromiseOrValue<BytesLike>,
-    a: PromiseOrValue<string>,
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
-  ): Promise<ContractTransaction>;
-
-  setAuthorisation(
-    node: PromiseOrValue<BytesLike>,
-    target: PromiseOrValue<string>,
-    isAuthorised: PromiseOrValue<boolean>,
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
-  ): Promise<ContractTransaction>;
-
-  setContenthash(
-    node: PromiseOrValue<BytesLike>,
-    hash: PromiseOrValue<BytesLike>,
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
-  ): Promise<ContractTransaction>;
-
-  setDNSRecords(
-    node: PromiseOrValue<BytesLike>,
-    data: PromiseOrValue<BytesLike>,
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
-  ): Promise<ContractTransaction>;
-
-  setInterface(
-    node: PromiseOrValue<BytesLike>,
-    interfaceID: PromiseOrValue<BytesLike>,
-    implementer: PromiseOrValue<string>,
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
-  ): Promise<ContractTransaction>;
-
-  setName(
-    node: PromiseOrValue<BytesLike>,
-    name: PromiseOrValue<string>,
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
-  ): Promise<ContractTransaction>;
-
-  setPubkey(
-    node: PromiseOrValue<BytesLike>,
-    x: PromiseOrValue<BytesLike>,
-    y: PromiseOrValue<BytesLike>,
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
-  ): Promise<ContractTransaction>;
-
-  setText(
-    node: PromiseOrValue<BytesLike>,
-    key: PromiseOrValue<string>,
-    value: PromiseOrValue<string>,
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
-  ): Promise<ContractTransaction>;
-
-  supportsInterface(
-    interfaceID: PromiseOrValue<BytesLike>,
-    overrides?: CallOverrides
-  ): Promise<boolean>;
-
-  text(
-    node: PromiseOrValue<BytesLike>,
-    key: PromiseOrValue<string>,
-    overrides?: CallOverrides
-  ): Promise<string>;
-
-  callStatic: {
-    ABI(
-      node: PromiseOrValue<BytesLike>,
-      contentTypes: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<[BigNumber, string]>;
-
-    addr(
-      node: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<string>;
-
-    authorisations(
-      arg0: PromiseOrValue<BytesLike>,
-      arg1: PromiseOrValue<string>,
-      arg2: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<boolean>;
-
-    clearDNSZone(
-      node: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    contenthash(
-      node: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<string>;
-
-    dnsRecord(
-      node: PromiseOrValue<BytesLike>,
-      name: PromiseOrValue<BytesLike>,
-      resource: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<string>;
-
-    hasDNSRecords(
-      node: PromiseOrValue<BytesLike>,
-      name: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<boolean>;
-
-    interfaceImplementer(
-      node: PromiseOrValue<BytesLike>,
-      interfaceID: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<string>;
-
-    name(
-      node: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<string>;
-
-    pubkey(
-      node: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<[string, string] & { x: string; y: string }>;
-
-    setABI(
-      node: PromiseOrValue<BytesLike>,
-      contentType: PromiseOrValue<BigNumberish>,
-      data: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    "setAddr(bytes32,uint256,bytes)"(
-      node: PromiseOrValue<BytesLike>,
-      coinType: PromiseOrValue<BigNumberish>,
-      a: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    "setAddr(bytes32,address)"(
-      node: PromiseOrValue<BytesLike>,
-      a: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    setAuthorisation(
-      node: PromiseOrValue<BytesLike>,
-      target: PromiseOrValue<string>,
-      isAuthorised: PromiseOrValue<boolean>,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    setContenthash(
-      node: PromiseOrValue<BytesLike>,
-      hash: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    setDNSRecords(
-      node: PromiseOrValue<BytesLike>,
-      data: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    setInterface(
-      node: PromiseOrValue<BytesLike>,
-      interfaceID: PromiseOrValue<BytesLike>,
-      implementer: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    setName(
-      node: PromiseOrValue<BytesLike>,
-      name: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    setPubkey(
-      node: PromiseOrValue<BytesLike>,
-      x: PromiseOrValue<BytesLike>,
-      y: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    setText(
-      node: PromiseOrValue<BytesLike>,
-      key: PromiseOrValue<string>,
-      value: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    supportsInterface(
-      interfaceID: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<boolean>;
-
-    text(
-      node: PromiseOrValue<BytesLike>,
-      key: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<string>;
-  };
-
-  filters: {
-    "ABIChanged(bytes32,uint256)"(
-      node?: PromiseOrValue<BytesLike> | null,
-      contentType?: PromiseOrValue<BigNumberish> | null
-    ): ABIChangedEventFilter;
-    ABIChanged(
-      node?: PromiseOrValue<BytesLike> | null,
-      contentType?: PromiseOrValue<BigNumberish> | null
-    ): ABIChangedEventFilter;
-
-    "AddrChanged(bytes32,address)"(
-      node?: PromiseOrValue<BytesLike> | null,
-      a?: null
-    ): AddrChangedEventFilter;
-    AddrChanged(
-      node?: PromiseOrValue<BytesLike> | null,
-      a?: null
-    ): AddrChangedEventFilter;
-
-    "AddressChanged(bytes32,uint256,bytes)"(
-      node?: PromiseOrValue<BytesLike> | null,
-      coinType?: null,
-      newAddress?: null
-    ): AddressChangedEventFilter;
-    AddressChanged(
-      node?: PromiseOrValue<BytesLike> | null,
-      coinType?: null,
-      newAddress?: null
-    ): AddressChangedEventFilter;
-
-    "AuthorisationChanged(bytes32,address,address,bool)"(
-      node?: PromiseOrValue<BytesLike> | null,
-      owner?: PromiseOrValue<string> | null,
-      target?: PromiseOrValue<string> | null,
-      isAuthorised?: null
-    ): AuthorisationChangedEventFilter;
-    AuthorisationChanged(
-      node?: PromiseOrValue<BytesLike> | null,
-      owner?: PromiseOrValue<string> | null,
-      target?: PromiseOrValue<string> | null,
-      isAuthorised?: null
-    ): AuthorisationChangedEventFilter;
-
-    "ContenthashChanged(bytes32,bytes)"(
-      node?: PromiseOrValue<BytesLike> | null,
-      hash?: null
-    ): ContenthashChangedEventFilter;
-    ContenthashChanged(
-      node?: PromiseOrValue<BytesLike> | null,
-      hash?: null
-    ): ContenthashChangedEventFilter;
-
-    "DNSRecordChanged(bytes32,bytes,uint16,bytes)"(
-      node?: PromiseOrValue<BytesLike> | null,
-      name?: null,
-      resource?: null,
-      record?: null
-    ): DNSRecordChangedEventFilter;
-    DNSRecordChanged(
-      node?: PromiseOrValue<BytesLike> | null,
-      name?: null,
-      resource?: null,
-      record?: null
-    ): DNSRecordChangedEventFilter;
-
-    "DNSRecordDeleted(bytes32,bytes,uint16)"(
-      node?: PromiseOrValue<BytesLike> | null,
-      name?: null,
-      resource?: null
-    ): DNSRecordDeletedEventFilter;
-    DNSRecordDeleted(
-      node?: PromiseOrValue<BytesLike> | null,
-      name?: null,
-      resource?: null
-    ): DNSRecordDeletedEventFilter;
-
-    "DNSZoneCleared(bytes32)"(
-      node?: PromiseOrValue<BytesLike> | null
-    ): DNSZoneClearedEventFilter;
-    DNSZoneCleared(
-      node?: PromiseOrValue<BytesLike> | null
-    ): DNSZoneClearedEventFilter;
-
-    "InterfaceChanged(bytes32,bytes4,address)"(
-      node?: PromiseOrValue<BytesLike> | null,
-      interfaceID?: PromiseOrValue<BytesLike> | null,
-      implementer?: null
-    ): InterfaceChangedEventFilter;
-    InterfaceChanged(
-      node?: PromiseOrValue<BytesLike> | null,
-      interfaceID?: PromiseOrValue<BytesLike> | null,
-      implementer?: null
-    ): InterfaceChangedEventFilter;
-
-    "NameChanged(bytes32,string)"(
-      node?: PromiseOrValue<BytesLike> | null,
-      name?: null
-    ): NameChangedEventFilter;
-    NameChanged(
-      node?: PromiseOrValue<BytesLike> | null,
-      name?: null
-    ): NameChangedEventFilter;
-
-    "PubkeyChanged(bytes32,bytes32,bytes32)"(
-      node?: PromiseOrValue<BytesLike> | null,
-      x?: null,
-      y?: null
-    ): PubkeyChangedEventFilter;
-    PubkeyChanged(
-      node?: PromiseOrValue<BytesLike> | null,
-      x?: null,
-      y?: null
-    ): PubkeyChangedEventFilter;
-
-    "TextChanged(bytes32,string,string)"(
-      node?: PromiseOrValue<BytesLike> | null,
-      indexedKey?: PromiseOrValue<string> | null,
-      key?: null
-    ): TextChangedEventFilter;
-    TextChanged(
-      node?: PromiseOrValue<BytesLike> | null,
-      indexedKey?: PromiseOrValue<string> | null,
-      key?: null
-    ): TextChangedEventFilter;
-  };
-
-  estimateGas: {
-    ABI(
-      node: PromiseOrValue<BytesLike>,
-      contentTypes: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    addr(
-      node: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    authorisations(
-      arg0: PromiseOrValue<BytesLike>,
-      arg1: PromiseOrValue<string>,
-      arg2: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    clearDNSZone(
-      node: PromiseOrValue<BytesLike>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<BigNumber>;
-
-    contenthash(
-      node: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    dnsRecord(
-      node: PromiseOrValue<BytesLike>,
-      name: PromiseOrValue<BytesLike>,
-      resource: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    hasDNSRecords(
-      node: PromiseOrValue<BytesLike>,
-      name: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    interfaceImplementer(
-      node: PromiseOrValue<BytesLike>,
-      interfaceID: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    name(
-      node: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    pubkey(
-      node: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    setABI(
-      node: PromiseOrValue<BytesLike>,
-      contentType: PromiseOrValue<BigNumberish>,
-      data: PromiseOrValue<BytesLike>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<BigNumber>;
-
-    "setAddr(bytes32,uint256,bytes)"(
-      node: PromiseOrValue<BytesLike>,
-      coinType: PromiseOrValue<BigNumberish>,
-      a: PromiseOrValue<BytesLike>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<BigNumber>;
-
-    "setAddr(bytes32,address)"(
-      node: PromiseOrValue<BytesLike>,
-      a: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<BigNumber>;
-
-    setAuthorisation(
-      node: PromiseOrValue<BytesLike>,
-      target: PromiseOrValue<string>,
-      isAuthorised: PromiseOrValue<boolean>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<BigNumber>;
-
-    setContenthash(
-      node: PromiseOrValue<BytesLike>,
-      hash: PromiseOrValue<BytesLike>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<BigNumber>;
-
-    setDNSRecords(
-      node: PromiseOrValue<BytesLike>,
-      data: PromiseOrValue<BytesLike>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<BigNumber>;
-
-    setInterface(
-      node: PromiseOrValue<BytesLike>,
-      interfaceID: PromiseOrValue<BytesLike>,
-      implementer: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<BigNumber>;
-
-    setName(
-      node: PromiseOrValue<BytesLike>,
-      name: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<BigNumber>;
-
-    setPubkey(
-      node: PromiseOrValue<BytesLike>,
-      x: PromiseOrValue<BytesLike>,
-      y: PromiseOrValue<BytesLike>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<BigNumber>;
-
-    setText(
-      node: PromiseOrValue<BytesLike>,
-      key: PromiseOrValue<string>,
-      value: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<BigNumber>;
-
-    supportsInterface(
-      interfaceID: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    text(
-      node: PromiseOrValue<BytesLike>,
-      key: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-  };
-
-  populateTransaction: {
-    ABI(
-      node: PromiseOrValue<BytesLike>,
-      contentTypes: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    addr(
-      node: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    authorisations(
-      arg0: PromiseOrValue<BytesLike>,
-      arg1: PromiseOrValue<string>,
-      arg2: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    clearDNSZone(
-      node: PromiseOrValue<BytesLike>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<PopulatedTransaction>;
-
-    contenthash(
-      node: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    dnsRecord(
-      node: PromiseOrValue<BytesLike>,
-      name: PromiseOrValue<BytesLike>,
-      resource: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    hasDNSRecords(
-      node: PromiseOrValue<BytesLike>,
-      name: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    interfaceImplementer(
-      node: PromiseOrValue<BytesLike>,
-      interfaceID: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    name(
-      node: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    pubkey(
-      node: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    setABI(
-      node: PromiseOrValue<BytesLike>,
-      contentType: PromiseOrValue<BigNumberish>,
-      data: PromiseOrValue<BytesLike>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<PopulatedTransaction>;
-
-    "setAddr(bytes32,uint256,bytes)"(
-      node: PromiseOrValue<BytesLike>,
-      coinType: PromiseOrValue<BigNumberish>,
-      a: PromiseOrValue<BytesLike>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<PopulatedTransaction>;
-
-    "setAddr(bytes32,address)"(
-      node: PromiseOrValue<BytesLike>,
-      a: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<PopulatedTransaction>;
-
-    setAuthorisation(
-      node: PromiseOrValue<BytesLike>,
-      target: PromiseOrValue<string>,
-      isAuthorised: PromiseOrValue<boolean>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<PopulatedTransaction>;
-
-    setContenthash(
-      node: PromiseOrValue<BytesLike>,
-      hash: PromiseOrValue<BytesLike>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<PopulatedTransaction>;
-
-    setDNSRecords(
-      node: PromiseOrValue<BytesLike>,
-      data: PromiseOrValue<BytesLike>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<PopulatedTransaction>;
-
-    setInterface(
-      node: PromiseOrValue<BytesLike>,
-      interfaceID: PromiseOrValue<BytesLike>,
-      implementer: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<PopulatedTransaction>;
-
-    setName(
-      node: PromiseOrValue<BytesLike>,
-      name: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<PopulatedTransaction>;
-
-    setPubkey(
-      node: PromiseOrValue<BytesLike>,
-      x: PromiseOrValue<BytesLike>,
-      y: PromiseOrValue<BytesLike>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<PopulatedTransaction>;
-
-    setText(
-      node: PromiseOrValue<BytesLike>,
-      key: PromiseOrValue<string>,
-      value: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<PopulatedTransaction>;
-
-    supportsInterface(
-      interfaceID: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    text(
-      node: PromiseOrValue<BytesLike>,
-      key: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-  };
-}
diff --git a/src/legacy/abis/types/EnsRegistrar.d.ts b/src/legacy/abis/types/EnsRegistrar.d.ts
deleted file mode 100644
index ec0a758238..0000000000
--- a/src/legacy/abis/types/EnsRegistrar.d.ts
+++ /dev/null
@@ -1,607 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-
-import {
-  ethers,
-  EventFilter,
-  Signer,
-  BigNumber,
-  BigNumberish,
-  PopulatedTransaction,
-  BaseContract,
-  ContractTransaction,
-  Overrides,
-  CallOverrides,
-} from "ethers";
-import { BytesLike } from "@ethersproject/bytes";
-import { Listener, Provider } from "@ethersproject/providers";
-import { FunctionFragment, EventFragment, Result } from "@ethersproject/abi";
-import type { TypedEventFilter, TypedEvent, TypedListener } from "./common";
-
-interface EnsRegistrarInterface extends ethers.utils.Interface {
-  functions: {
-    "isApprovedForAll(address,address)": FunctionFragment;
-    "old()": FunctionFragment;
-    "owner(bytes32)": FunctionFragment;
-    "recordExists(bytes32)": FunctionFragment;
-    "resolver(bytes32)": FunctionFragment;
-    "setApprovalForAll(address,bool)": FunctionFragment;
-    "setOwner(bytes32,address)": FunctionFragment;
-    "setRecord(bytes32,address,address,uint64)": FunctionFragment;
-    "setResolver(bytes32,address)": FunctionFragment;
-    "setSubnodeOwner(bytes32,bytes32,address)": FunctionFragment;
-    "setSubnodeRecord(bytes32,bytes32,address,address,uint64)": FunctionFragment;
-    "setTTL(bytes32,uint64)": FunctionFragment;
-    "ttl(bytes32)": FunctionFragment;
-  };
-
-  encodeFunctionData(
-    functionFragment: "isApprovedForAll",
-    values: [string, string]
-  ): string;
-  encodeFunctionData(functionFragment: "old", values?: undefined): string;
-  encodeFunctionData(functionFragment: "owner", values: [BytesLike]): string;
-  encodeFunctionData(
-    functionFragment: "recordExists",
-    values: [BytesLike]
-  ): string;
-  encodeFunctionData(functionFragment: "resolver", values: [BytesLike]): string;
-  encodeFunctionData(
-    functionFragment: "setApprovalForAll",
-    values: [string, boolean]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "setOwner",
-    values: [BytesLike, string]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "setRecord",
-    values: [BytesLike, string, string, BigNumberish]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "setResolver",
-    values: [BytesLike, string]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "setSubnodeOwner",
-    values: [BytesLike, BytesLike, string]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "setSubnodeRecord",
-    values: [BytesLike, BytesLike, string, string, BigNumberish]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "setTTL",
-    values: [BytesLike, BigNumberish]
-  ): string;
-  encodeFunctionData(functionFragment: "ttl", values: [BytesLike]): string;
-
-  decodeFunctionResult(
-    functionFragment: "isApprovedForAll",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "old", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "owner", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "recordExists",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "resolver", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "setApprovalForAll",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "setOwner", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "setRecord", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "setResolver",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "setSubnodeOwner",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "setSubnodeRecord",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "setTTL", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "ttl", data: BytesLike): Result;
-
-  events: {
-    "ApprovalForAll(address,address,bool)": EventFragment;
-    "NewOwner(bytes32,bytes32,address)": EventFragment;
-    "NewResolver(bytes32,address)": EventFragment;
-    "NewTTL(bytes32,uint64)": EventFragment;
-    "Transfer(bytes32,address)": EventFragment;
-  };
-
-  getEvent(nameOrSignatureOrTopic: "ApprovalForAll"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "NewOwner"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "NewResolver"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "NewTTL"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "Transfer"): EventFragment;
-}
-
-export type ApprovalForAllEvent = TypedEvent<
-  [string, string, boolean] & {
-    owner: string;
-    operator: string;
-    approved: boolean;
-  }
->;
-
-export type NewOwnerEvent = TypedEvent<
-  [string, string, string] & { node: string; label: string; owner: string }
->;
-
-export type NewResolverEvent = TypedEvent<
-  [string, string] & { node: string; resolver: string }
->;
-
-export type NewTTLEvent = TypedEvent<
-  [string, BigNumber] & { node: string; ttl: BigNumber }
->;
-
-export type TransferEvent = TypedEvent<
-  [string, string] & { node: string; owner: string }
->;
-
-export class EnsRegistrar extends BaseContract {
-  connect(signerOrProvider: Signer | Provider | string): this;
-  attach(addressOrName: string): this;
-  deployed(): Promise<this>;
-
-  listeners<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter?: TypedEventFilter<EventArgsArray, EventArgsObject>
-  ): Array<TypedListener<EventArgsArray, EventArgsObject>>;
-  off<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    listener: TypedListener<EventArgsArray, EventArgsObject>
-  ): this;
-  on<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    listener: TypedListener<EventArgsArray, EventArgsObject>
-  ): this;
-  once<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    listener: TypedListener<EventArgsArray, EventArgsObject>
-  ): this;
-  removeListener<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    listener: TypedListener<EventArgsArray, EventArgsObject>
-  ): this;
-  removeAllListeners<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>
-  ): this;
-
-  listeners(eventName?: string): Array<Listener>;
-  off(eventName: string, listener: Listener): this;
-  on(eventName: string, listener: Listener): this;
-  once(eventName: string, listener: Listener): this;
-  removeListener(eventName: string, listener: Listener): this;
-  removeAllListeners(eventName?: string): this;
-
-  queryFilter<EventArgsArray extends Array<any>, EventArgsObject>(
-    event: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    fromBlockOrBlockhash?: string | number | undefined,
-    toBlock?: string | number | undefined
-  ): Promise<Array<TypedEvent<EventArgsArray & EventArgsObject>>>;
-
-  interface: EnsRegistrarInterface;
-
-  functions: {
-    isApprovedForAll(
-      owner: string,
-      operator: string,
-      overrides?: CallOverrides
-    ): Promise<[boolean]>;
-
-    old(overrides?: CallOverrides): Promise<[string]>;
-
-    owner(node: BytesLike, overrides?: CallOverrides): Promise<[string]>;
-
-    recordExists(
-      node: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<[boolean]>;
-
-    resolver(node: BytesLike, overrides?: CallOverrides): Promise<[string]>;
-
-    setApprovalForAll(
-      operator: string,
-      approved: boolean,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    setOwner(
-      node: BytesLike,
-      owner: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    setRecord(
-      node: BytesLike,
-      owner: string,
-      resolver: string,
-      ttl: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    setResolver(
-      node: BytesLike,
-      resolver: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    setSubnodeOwner(
-      node: BytesLike,
-      label: BytesLike,
-      owner: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    setSubnodeRecord(
-      node: BytesLike,
-      label: BytesLike,
-      owner: string,
-      resolver: string,
-      ttl: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    setTTL(
-      node: BytesLike,
-      ttl: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    ttl(node: BytesLike, overrides?: CallOverrides): Promise<[BigNumber]>;
-  };
-
-  isApprovedForAll(
-    owner: string,
-    operator: string,
-    overrides?: CallOverrides
-  ): Promise<boolean>;
-
-  old(overrides?: CallOverrides): Promise<string>;
-
-  owner(node: BytesLike, overrides?: CallOverrides): Promise<string>;
-
-  recordExists(node: BytesLike, overrides?: CallOverrides): Promise<boolean>;
-
-  resolver(node: BytesLike, overrides?: CallOverrides): Promise<string>;
-
-  setApprovalForAll(
-    operator: string,
-    approved: boolean,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  setOwner(
-    node: BytesLike,
-    owner: string,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  setRecord(
-    node: BytesLike,
-    owner: string,
-    resolver: string,
-    ttl: BigNumberish,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  setResolver(
-    node: BytesLike,
-    resolver: string,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  setSubnodeOwner(
-    node: BytesLike,
-    label: BytesLike,
-    owner: string,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  setSubnodeRecord(
-    node: BytesLike,
-    label: BytesLike,
-    owner: string,
-    resolver: string,
-    ttl: BigNumberish,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  setTTL(
-    node: BytesLike,
-    ttl: BigNumberish,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  ttl(node: BytesLike, overrides?: CallOverrides): Promise<BigNumber>;
-
-  callStatic: {
-    isApprovedForAll(
-      owner: string,
-      operator: string,
-      overrides?: CallOverrides
-    ): Promise<boolean>;
-
-    old(overrides?: CallOverrides): Promise<string>;
-
-    owner(node: BytesLike, overrides?: CallOverrides): Promise<string>;
-
-    recordExists(node: BytesLike, overrides?: CallOverrides): Promise<boolean>;
-
-    resolver(node: BytesLike, overrides?: CallOverrides): Promise<string>;
-
-    setApprovalForAll(
-      operator: string,
-      approved: boolean,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    setOwner(
-      node: BytesLike,
-      owner: string,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    setRecord(
-      node: BytesLike,
-      owner: string,
-      resolver: string,
-      ttl: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    setResolver(
-      node: BytesLike,
-      resolver: string,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    setSubnodeOwner(
-      node: BytesLike,
-      label: BytesLike,
-      owner: string,
-      overrides?: CallOverrides
-    ): Promise<string>;
-
-    setSubnodeRecord(
-      node: BytesLike,
-      label: BytesLike,
-      owner: string,
-      resolver: string,
-      ttl: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    setTTL(
-      node: BytesLike,
-      ttl: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    ttl(node: BytesLike, overrides?: CallOverrides): Promise<BigNumber>;
-  };
-
-  filters: {
-    "ApprovalForAll(address,address,bool)"(
-      owner?: string | null,
-      operator?: string | null,
-      approved?: null
-    ): TypedEventFilter<
-      [string, string, boolean],
-      { owner: string; operator: string; approved: boolean }
-    >;
-
-    ApprovalForAll(
-      owner?: string | null,
-      operator?: string | null,
-      approved?: null
-    ): TypedEventFilter<
-      [string, string, boolean],
-      { owner: string; operator: string; approved: boolean }
-    >;
-
-    "NewOwner(bytes32,bytes32,address)"(
-      node?: BytesLike | null,
-      label?: BytesLike | null,
-      owner?: null
-    ): TypedEventFilter<
-      [string, string, string],
-      { node: string; label: string; owner: string }
-    >;
-
-    NewOwner(
-      node?: BytesLike | null,
-      label?: BytesLike | null,
-      owner?: null
-    ): TypedEventFilter<
-      [string, string, string],
-      { node: string; label: string; owner: string }
-    >;
-
-    "NewResolver(bytes32,address)"(
-      node?: BytesLike | null,
-      resolver?: null
-    ): TypedEventFilter<[string, string], { node: string; resolver: string }>;
-
-    NewResolver(
-      node?: BytesLike | null,
-      resolver?: null
-    ): TypedEventFilter<[string, string], { node: string; resolver: string }>;
-
-    "NewTTL(bytes32,uint64)"(
-      node?: BytesLike | null,
-      ttl?: null
-    ): TypedEventFilter<[string, BigNumber], { node: string; ttl: BigNumber }>;
-
-    NewTTL(
-      node?: BytesLike | null,
-      ttl?: null
-    ): TypedEventFilter<[string, BigNumber], { node: string; ttl: BigNumber }>;
-
-    "Transfer(bytes32,address)"(
-      node?: BytesLike | null,
-      owner?: null
-    ): TypedEventFilter<[string, string], { node: string; owner: string }>;
-
-    Transfer(
-      node?: BytesLike | null,
-      owner?: null
-    ): TypedEventFilter<[string, string], { node: string; owner: string }>;
-  };
-
-  estimateGas: {
-    isApprovedForAll(
-      owner: string,
-      operator: string,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    old(overrides?: CallOverrides): Promise<BigNumber>;
-
-    owner(node: BytesLike, overrides?: CallOverrides): Promise<BigNumber>;
-
-    recordExists(
-      node: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    resolver(node: BytesLike, overrides?: CallOverrides): Promise<BigNumber>;
-
-    setApprovalForAll(
-      operator: string,
-      approved: boolean,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    setOwner(
-      node: BytesLike,
-      owner: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    setRecord(
-      node: BytesLike,
-      owner: string,
-      resolver: string,
-      ttl: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    setResolver(
-      node: BytesLike,
-      resolver: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    setSubnodeOwner(
-      node: BytesLike,
-      label: BytesLike,
-      owner: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    setSubnodeRecord(
-      node: BytesLike,
-      label: BytesLike,
-      owner: string,
-      resolver: string,
-      ttl: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    setTTL(
-      node: BytesLike,
-      ttl: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    ttl(node: BytesLike, overrides?: CallOverrides): Promise<BigNumber>;
-  };
-
-  populateTransaction: {
-    isApprovedForAll(
-      owner: string,
-      operator: string,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    old(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    owner(
-      node: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    recordExists(
-      node: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    resolver(
-      node: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    setApprovalForAll(
-      operator: string,
-      approved: boolean,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    setOwner(
-      node: BytesLike,
-      owner: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    setRecord(
-      node: BytesLike,
-      owner: string,
-      resolver: string,
-      ttl: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    setResolver(
-      node: BytesLike,
-      resolver: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    setSubnodeOwner(
-      node: BytesLike,
-      label: BytesLike,
-      owner: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    setSubnodeRecord(
-      node: BytesLike,
-      label: BytesLike,
-      owner: string,
-      resolver: string,
-      ttl: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    setTTL(
-      node: BytesLike,
-      ttl: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    ttl(
-      node: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-  };
-}
diff --git a/src/legacy/abis/types/EnsRegistrar.ts b/src/legacy/abis/types/EnsRegistrar.ts
deleted file mode 100644
index 882f6a7af5..0000000000
--- a/src/legacy/abis/types/EnsRegistrar.ts
+++ /dev/null
@@ -1,691 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-import type {
-  BaseContract,
-  BigNumber,
-  BigNumberish,
-  BytesLike,
-  CallOverrides,
-  ContractTransaction,
-  Overrides,
-  PopulatedTransaction,
-  Signer,
-  utils,
-} from "ethers";
-import type {
-  FunctionFragment,
-  Result,
-  EventFragment,
-} from "@ethersproject/abi";
-import type { Listener, Provider } from "@ethersproject/providers";
-import type {
-  TypedEventFilter,
-  TypedEvent,
-  TypedListener,
-  OnEvent,
-  PromiseOrValue,
-} from "./common";
-
-export interface EnsRegistrarInterface extends utils.Interface {
-  functions: {
-    "isApprovedForAll(address,address)": FunctionFragment;
-    "old()": FunctionFragment;
-    "owner(bytes32)": FunctionFragment;
-    "recordExists(bytes32)": FunctionFragment;
-    "resolver(bytes32)": FunctionFragment;
-    "setApprovalForAll(address,bool)": FunctionFragment;
-    "setOwner(bytes32,address)": FunctionFragment;
-    "setRecord(bytes32,address,address,uint64)": FunctionFragment;
-    "setResolver(bytes32,address)": FunctionFragment;
-    "setSubnodeOwner(bytes32,bytes32,address)": FunctionFragment;
-    "setSubnodeRecord(bytes32,bytes32,address,address,uint64)": FunctionFragment;
-    "setTTL(bytes32,uint64)": FunctionFragment;
-    "ttl(bytes32)": FunctionFragment;
-  };
-
-  getFunction(
-    nameOrSignatureOrTopic:
-      | "isApprovedForAll"
-      | "old"
-      | "owner"
-      | "recordExists"
-      | "resolver"
-      | "setApprovalForAll"
-      | "setOwner"
-      | "setRecord"
-      | "setResolver"
-      | "setSubnodeOwner"
-      | "setSubnodeRecord"
-      | "setTTL"
-      | "ttl"
-  ): FunctionFragment;
-
-  encodeFunctionData(
-    functionFragment: "isApprovedForAll",
-    values: [PromiseOrValue<string>, PromiseOrValue<string>]
-  ): string;
-  encodeFunctionData(functionFragment: "old", values?: undefined): string;
-  encodeFunctionData(
-    functionFragment: "owner",
-    values: [PromiseOrValue<BytesLike>]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "recordExists",
-    values: [PromiseOrValue<BytesLike>]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "resolver",
-    values: [PromiseOrValue<BytesLike>]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "setApprovalForAll",
-    values: [PromiseOrValue<string>, PromiseOrValue<boolean>]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "setOwner",
-    values: [PromiseOrValue<BytesLike>, PromiseOrValue<string>]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "setRecord",
-    values: [
-      PromiseOrValue<BytesLike>,
-      PromiseOrValue<string>,
-      PromiseOrValue<string>,
-      PromiseOrValue<BigNumberish>
-    ]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "setResolver",
-    values: [PromiseOrValue<BytesLike>, PromiseOrValue<string>]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "setSubnodeOwner",
-    values: [
-      PromiseOrValue<BytesLike>,
-      PromiseOrValue<BytesLike>,
-      PromiseOrValue<string>
-    ]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "setSubnodeRecord",
-    values: [
-      PromiseOrValue<BytesLike>,
-      PromiseOrValue<BytesLike>,
-      PromiseOrValue<string>,
-      PromiseOrValue<string>,
-      PromiseOrValue<BigNumberish>
-    ]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "setTTL",
-    values: [PromiseOrValue<BytesLike>, PromiseOrValue<BigNumberish>]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "ttl",
-    values: [PromiseOrValue<BytesLike>]
-  ): string;
-
-  decodeFunctionResult(
-    functionFragment: "isApprovedForAll",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "old", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "owner", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "recordExists",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "resolver", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "setApprovalForAll",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "setOwner", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "setRecord", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "setResolver",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "setSubnodeOwner",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "setSubnodeRecord",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "setTTL", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "ttl", data: BytesLike): Result;
-
-  events: {
-    "ApprovalForAll(address,address,bool)": EventFragment;
-    "NewOwner(bytes32,bytes32,address)": EventFragment;
-    "NewResolver(bytes32,address)": EventFragment;
-    "NewTTL(bytes32,uint64)": EventFragment;
-    "Transfer(bytes32,address)": EventFragment;
-  };
-
-  getEvent(nameOrSignatureOrTopic: "ApprovalForAll"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "NewOwner"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "NewResolver"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "NewTTL"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "Transfer"): EventFragment;
-}
-
-export interface ApprovalForAllEventObject {
-  owner: string;
-  operator: string;
-  approved: boolean;
-}
-export type ApprovalForAllEvent = TypedEvent<
-  [string, string, boolean],
-  ApprovalForAllEventObject
->;
-
-export type ApprovalForAllEventFilter = TypedEventFilter<ApprovalForAllEvent>;
-
-export interface NewOwnerEventObject {
-  node: string;
-  label: string;
-  owner: string;
-}
-export type NewOwnerEvent = TypedEvent<
-  [string, string, string],
-  NewOwnerEventObject
->;
-
-export type NewOwnerEventFilter = TypedEventFilter<NewOwnerEvent>;
-
-export interface NewResolverEventObject {
-  node: string;
-  resolver: string;
-}
-export type NewResolverEvent = TypedEvent<
-  [string, string],
-  NewResolverEventObject
->;
-
-export type NewResolverEventFilter = TypedEventFilter<NewResolverEvent>;
-
-export interface NewTTLEventObject {
-  node: string;
-  ttl: BigNumber;
-}
-export type NewTTLEvent = TypedEvent<[string, BigNumber], NewTTLEventObject>;
-
-export type NewTTLEventFilter = TypedEventFilter<NewTTLEvent>;
-
-export interface TransferEventObject {
-  node: string;
-  owner: string;
-}
-export type TransferEvent = TypedEvent<[string, string], TransferEventObject>;
-
-export type TransferEventFilter = TypedEventFilter<TransferEvent>;
-
-export interface EnsRegistrar extends BaseContract {
-  connect(signerOrProvider: Signer | Provider | string): this;
-  attach(addressOrName: string): this;
-  deployed(): Promise<this>;
-
-  interface: EnsRegistrarInterface;
-
-  queryFilter<TEvent extends TypedEvent>(
-    event: TypedEventFilter<TEvent>,
-    fromBlockOrBlockhash?: string | number | undefined,
-    toBlock?: string | number | undefined
-  ): Promise<Array<TEvent>>;
-
-  listeners<TEvent extends TypedEvent>(
-    eventFilter?: TypedEventFilter<TEvent>
-  ): Array<TypedListener<TEvent>>;
-  listeners(eventName?: string): Array<Listener>;
-  removeAllListeners<TEvent extends TypedEvent>(
-    eventFilter: TypedEventFilter<TEvent>
-  ): this;
-  removeAllListeners(eventName?: string): this;
-  off: OnEvent<this>;
-  on: OnEvent<this>;
-  once: OnEvent<this>;
-  removeListener: OnEvent<this>;
-
-  functions: {
-    isApprovedForAll(
-      owner: PromiseOrValue<string>,
-      operator: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<[boolean]>;
-
-    old(overrides?: CallOverrides): Promise<[string]>;
-
-    owner(
-      node: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<[string]>;
-
-    recordExists(
-      node: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<[boolean]>;
-
-    resolver(
-      node: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<[string]>;
-
-    setApprovalForAll(
-      operator: PromiseOrValue<string>,
-      approved: PromiseOrValue<boolean>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<ContractTransaction>;
-
-    setOwner(
-      node: PromiseOrValue<BytesLike>,
-      owner: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<ContractTransaction>;
-
-    setRecord(
-      node: PromiseOrValue<BytesLike>,
-      owner: PromiseOrValue<string>,
-      resolver: PromiseOrValue<string>,
-      ttl: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<ContractTransaction>;
-
-    setResolver(
-      node: PromiseOrValue<BytesLike>,
-      resolver: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<ContractTransaction>;
-
-    setSubnodeOwner(
-      node: PromiseOrValue<BytesLike>,
-      label: PromiseOrValue<BytesLike>,
-      owner: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<ContractTransaction>;
-
-    setSubnodeRecord(
-      node: PromiseOrValue<BytesLike>,
-      label: PromiseOrValue<BytesLike>,
-      owner: PromiseOrValue<string>,
-      resolver: PromiseOrValue<string>,
-      ttl: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<ContractTransaction>;
-
-    setTTL(
-      node: PromiseOrValue<BytesLike>,
-      ttl: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<ContractTransaction>;
-
-    ttl(
-      node: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<[BigNumber]>;
-  };
-
-  isApprovedForAll(
-    owner: PromiseOrValue<string>,
-    operator: PromiseOrValue<string>,
-    overrides?: CallOverrides
-  ): Promise<boolean>;
-
-  old(overrides?: CallOverrides): Promise<string>;
-
-  owner(
-    node: PromiseOrValue<BytesLike>,
-    overrides?: CallOverrides
-  ): Promise<string>;
-
-  recordExists(
-    node: PromiseOrValue<BytesLike>,
-    overrides?: CallOverrides
-  ): Promise<boolean>;
-
-  resolver(
-    node: PromiseOrValue<BytesLike>,
-    overrides?: CallOverrides
-  ): Promise<string>;
-
-  setApprovalForAll(
-    operator: PromiseOrValue<string>,
-    approved: PromiseOrValue<boolean>,
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
-  ): Promise<ContractTransaction>;
-
-  setOwner(
-    node: PromiseOrValue<BytesLike>,
-    owner: PromiseOrValue<string>,
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
-  ): Promise<ContractTransaction>;
-
-  setRecord(
-    node: PromiseOrValue<BytesLike>,
-    owner: PromiseOrValue<string>,
-    resolver: PromiseOrValue<string>,
-    ttl: PromiseOrValue<BigNumberish>,
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
-  ): Promise<ContractTransaction>;
-
-  setResolver(
-    node: PromiseOrValue<BytesLike>,
-    resolver: PromiseOrValue<string>,
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
-  ): Promise<ContractTransaction>;
-
-  setSubnodeOwner(
-    node: PromiseOrValue<BytesLike>,
-    label: PromiseOrValue<BytesLike>,
-    owner: PromiseOrValue<string>,
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
-  ): Promise<ContractTransaction>;
-
-  setSubnodeRecord(
-    node: PromiseOrValue<BytesLike>,
-    label: PromiseOrValue<BytesLike>,
-    owner: PromiseOrValue<string>,
-    resolver: PromiseOrValue<string>,
-    ttl: PromiseOrValue<BigNumberish>,
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
-  ): Promise<ContractTransaction>;
-
-  setTTL(
-    node: PromiseOrValue<BytesLike>,
-    ttl: PromiseOrValue<BigNumberish>,
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
-  ): Promise<ContractTransaction>;
-
-  ttl(
-    node: PromiseOrValue<BytesLike>,
-    overrides?: CallOverrides
-  ): Promise<BigNumber>;
-
-  callStatic: {
-    isApprovedForAll(
-      owner: PromiseOrValue<string>,
-      operator: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<boolean>;
-
-    old(overrides?: CallOverrides): Promise<string>;
-
-    owner(
-      node: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<string>;
-
-    recordExists(
-      node: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<boolean>;
-
-    resolver(
-      node: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<string>;
-
-    setApprovalForAll(
-      operator: PromiseOrValue<string>,
-      approved: PromiseOrValue<boolean>,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    setOwner(
-      node: PromiseOrValue<BytesLike>,
-      owner: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    setRecord(
-      node: PromiseOrValue<BytesLike>,
-      owner: PromiseOrValue<string>,
-      resolver: PromiseOrValue<string>,
-      ttl: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    setResolver(
-      node: PromiseOrValue<BytesLike>,
-      resolver: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    setSubnodeOwner(
-      node: PromiseOrValue<BytesLike>,
-      label: PromiseOrValue<BytesLike>,
-      owner: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<string>;
-
-    setSubnodeRecord(
-      node: PromiseOrValue<BytesLike>,
-      label: PromiseOrValue<BytesLike>,
-      owner: PromiseOrValue<string>,
-      resolver: PromiseOrValue<string>,
-      ttl: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    setTTL(
-      node: PromiseOrValue<BytesLike>,
-      ttl: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    ttl(
-      node: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-  };
-
-  filters: {
-    "ApprovalForAll(address,address,bool)"(
-      owner?: PromiseOrValue<string> | null,
-      operator?: PromiseOrValue<string> | null,
-      approved?: null
-    ): ApprovalForAllEventFilter;
-    ApprovalForAll(
-      owner?: PromiseOrValue<string> | null,
-      operator?: PromiseOrValue<string> | null,
-      approved?: null
-    ): ApprovalForAllEventFilter;
-
-    "NewOwner(bytes32,bytes32,address)"(
-      node?: PromiseOrValue<BytesLike> | null,
-      label?: PromiseOrValue<BytesLike> | null,
-      owner?: null
-    ): NewOwnerEventFilter;
-    NewOwner(
-      node?: PromiseOrValue<BytesLike> | null,
-      label?: PromiseOrValue<BytesLike> | null,
-      owner?: null
-    ): NewOwnerEventFilter;
-
-    "NewResolver(bytes32,address)"(
-      node?: PromiseOrValue<BytesLike> | null,
-      resolver?: null
-    ): NewResolverEventFilter;
-    NewResolver(
-      node?: PromiseOrValue<BytesLike> | null,
-      resolver?: null
-    ): NewResolverEventFilter;
-
-    "NewTTL(bytes32,uint64)"(
-      node?: PromiseOrValue<BytesLike> | null,
-      ttl?: null
-    ): NewTTLEventFilter;
-    NewTTL(
-      node?: PromiseOrValue<BytesLike> | null,
-      ttl?: null
-    ): NewTTLEventFilter;
-
-    "Transfer(bytes32,address)"(
-      node?: PromiseOrValue<BytesLike> | null,
-      owner?: null
-    ): TransferEventFilter;
-    Transfer(
-      node?: PromiseOrValue<BytesLike> | null,
-      owner?: null
-    ): TransferEventFilter;
-  };
-
-  estimateGas: {
-    isApprovedForAll(
-      owner: PromiseOrValue<string>,
-      operator: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    old(overrides?: CallOverrides): Promise<BigNumber>;
-
-    owner(
-      node: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    recordExists(
-      node: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    resolver(
-      node: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    setApprovalForAll(
-      operator: PromiseOrValue<string>,
-      approved: PromiseOrValue<boolean>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<BigNumber>;
-
-    setOwner(
-      node: PromiseOrValue<BytesLike>,
-      owner: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<BigNumber>;
-
-    setRecord(
-      node: PromiseOrValue<BytesLike>,
-      owner: PromiseOrValue<string>,
-      resolver: PromiseOrValue<string>,
-      ttl: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<BigNumber>;
-
-    setResolver(
-      node: PromiseOrValue<BytesLike>,
-      resolver: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<BigNumber>;
-
-    setSubnodeOwner(
-      node: PromiseOrValue<BytesLike>,
-      label: PromiseOrValue<BytesLike>,
-      owner: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<BigNumber>;
-
-    setSubnodeRecord(
-      node: PromiseOrValue<BytesLike>,
-      label: PromiseOrValue<BytesLike>,
-      owner: PromiseOrValue<string>,
-      resolver: PromiseOrValue<string>,
-      ttl: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<BigNumber>;
-
-    setTTL(
-      node: PromiseOrValue<BytesLike>,
-      ttl: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<BigNumber>;
-
-    ttl(
-      node: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-  };
-
-  populateTransaction: {
-    isApprovedForAll(
-      owner: PromiseOrValue<string>,
-      operator: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    old(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    owner(
-      node: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    recordExists(
-      node: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    resolver(
-      node: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    setApprovalForAll(
-      operator: PromiseOrValue<string>,
-      approved: PromiseOrValue<boolean>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<PopulatedTransaction>;
-
-    setOwner(
-      node: PromiseOrValue<BytesLike>,
-      owner: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<PopulatedTransaction>;
-
-    setRecord(
-      node: PromiseOrValue<BytesLike>,
-      owner: PromiseOrValue<string>,
-      resolver: PromiseOrValue<string>,
-      ttl: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<PopulatedTransaction>;
-
-    setResolver(
-      node: PromiseOrValue<BytesLike>,
-      resolver: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<PopulatedTransaction>;
-
-    setSubnodeOwner(
-      node: PromiseOrValue<BytesLike>,
-      label: PromiseOrValue<BytesLike>,
-      owner: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<PopulatedTransaction>;
-
-    setSubnodeRecord(
-      node: PromiseOrValue<BytesLike>,
-      label: PromiseOrValue<BytesLike>,
-      owner: PromiseOrValue<string>,
-      resolver: PromiseOrValue<string>,
-      ttl: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<PopulatedTransaction>;
-
-    setTTL(
-      node: PromiseOrValue<BytesLike>,
-      ttl: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<PopulatedTransaction>;
-
-    ttl(
-      node: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-  };
-}
diff --git a/src/legacy/abis/types/Erc1155.d.ts b/src/legacy/abis/types/Erc1155.d.ts
deleted file mode 100644
index f8fbed3a3a..0000000000
--- a/src/legacy/abis/types/Erc1155.d.ts
+++ /dev/null
@@ -1,134 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-
-import {
-  ethers,
-  EventFilter,
-  Signer,
-  BigNumber,
-  BigNumberish,
-  PopulatedTransaction,
-  BaseContract,
-  ContractTransaction,
-  CallOverrides,
-} from "ethers";
-import { BytesLike } from "@ethersproject/bytes";
-import { Listener, Provider } from "@ethersproject/providers";
-import { FunctionFragment, EventFragment, Result } from "@ethersproject/abi";
-import type { TypedEventFilter, TypedEvent, TypedListener } from "./common";
-
-interface Erc1155Interface extends ethers.utils.Interface {
-  functions: {
-    "balanceOf(address,uint256)": FunctionFragment;
-    "uri(uint256)": FunctionFragment;
-  };
-
-  encodeFunctionData(
-    functionFragment: "balanceOf",
-    values: [string, BigNumberish]
-  ): string;
-  encodeFunctionData(functionFragment: "uri", values: [BigNumberish]): string;
-
-  decodeFunctionResult(functionFragment: "balanceOf", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "uri", data: BytesLike): Result;
-
-  events: {};
-}
-
-export class Erc1155 extends BaseContract {
-  connect(signerOrProvider: Signer | Provider | string): this;
-  attach(addressOrName: string): this;
-  deployed(): Promise<this>;
-
-  listeners<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter?: TypedEventFilter<EventArgsArray, EventArgsObject>
-  ): Array<TypedListener<EventArgsArray, EventArgsObject>>;
-  off<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    listener: TypedListener<EventArgsArray, EventArgsObject>
-  ): this;
-  on<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    listener: TypedListener<EventArgsArray, EventArgsObject>
-  ): this;
-  once<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    listener: TypedListener<EventArgsArray, EventArgsObject>
-  ): this;
-  removeListener<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    listener: TypedListener<EventArgsArray, EventArgsObject>
-  ): this;
-  removeAllListeners<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>
-  ): this;
-
-  listeners(eventName?: string): Array<Listener>;
-  off(eventName: string, listener: Listener): this;
-  on(eventName: string, listener: Listener): this;
-  once(eventName: string, listener: Listener): this;
-  removeListener(eventName: string, listener: Listener): this;
-  removeAllListeners(eventName?: string): this;
-
-  queryFilter<EventArgsArray extends Array<any>, EventArgsObject>(
-    event: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    fromBlockOrBlockhash?: string | number | undefined,
-    toBlock?: string | number | undefined
-  ): Promise<Array<TypedEvent<EventArgsArray & EventArgsObject>>>;
-
-  interface: Erc1155Interface;
-
-  functions: {
-    balanceOf(
-      _owner: string,
-      _id: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<[BigNumber]>;
-
-    uri(_id: BigNumberish, overrides?: CallOverrides): Promise<[string]>;
-  };
-
-  balanceOf(
-    _owner: string,
-    _id: BigNumberish,
-    overrides?: CallOverrides
-  ): Promise<BigNumber>;
-
-  uri(_id: BigNumberish, overrides?: CallOverrides): Promise<string>;
-
-  callStatic: {
-    balanceOf(
-      _owner: string,
-      _id: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    uri(_id: BigNumberish, overrides?: CallOverrides): Promise<string>;
-  };
-
-  filters: {};
-
-  estimateGas: {
-    balanceOf(
-      _owner: string,
-      _id: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    uri(_id: BigNumberish, overrides?: CallOverrides): Promise<BigNumber>;
-  };
-
-  populateTransaction: {
-    balanceOf(
-      _owner: string,
-      _id: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    uri(
-      _id: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-  };
-}
diff --git a/src/legacy/abis/types/Erc1155.ts b/src/legacy/abis/types/Erc1155.ts
deleted file mode 100644
index 86eaa1536e..0000000000
--- a/src/legacy/abis/types/Erc1155.ts
+++ /dev/null
@@ -1,137 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-import type {
-  BaseContract,
-  BigNumber,
-  BigNumberish,
-  BytesLike,
-  CallOverrides,
-  PopulatedTransaction,
-  Signer,
-  utils,
-} from "ethers";
-import type { FunctionFragment, Result } from "@ethersproject/abi";
-import type { Listener, Provider } from "@ethersproject/providers";
-import type {
-  TypedEventFilter,
-  TypedEvent,
-  TypedListener,
-  OnEvent,
-  PromiseOrValue,
-} from "./common";
-
-export interface Erc1155Interface extends utils.Interface {
-  functions: {
-    "balanceOf(address,uint256)": FunctionFragment;
-    "uri(uint256)": FunctionFragment;
-  };
-
-  getFunction(nameOrSignatureOrTopic: "balanceOf" | "uri"): FunctionFragment;
-
-  encodeFunctionData(
-    functionFragment: "balanceOf",
-    values: [PromiseOrValue<string>, PromiseOrValue<BigNumberish>]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "uri",
-    values: [PromiseOrValue<BigNumberish>]
-  ): string;
-
-  decodeFunctionResult(functionFragment: "balanceOf", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "uri", data: BytesLike): Result;
-
-  events: {};
-}
-
-export interface Erc1155 extends BaseContract {
-  connect(signerOrProvider: Signer | Provider | string): this;
-  attach(addressOrName: string): this;
-  deployed(): Promise<this>;
-
-  interface: Erc1155Interface;
-
-  queryFilter<TEvent extends TypedEvent>(
-    event: TypedEventFilter<TEvent>,
-    fromBlockOrBlockhash?: string | number | undefined,
-    toBlock?: string | number | undefined
-  ): Promise<Array<TEvent>>;
-
-  listeners<TEvent extends TypedEvent>(
-    eventFilter?: TypedEventFilter<TEvent>
-  ): Array<TypedListener<TEvent>>;
-  listeners(eventName?: string): Array<Listener>;
-  removeAllListeners<TEvent extends TypedEvent>(
-    eventFilter: TypedEventFilter<TEvent>
-  ): this;
-  removeAllListeners(eventName?: string): this;
-  off: OnEvent<this>;
-  on: OnEvent<this>;
-  once: OnEvent<this>;
-  removeListener: OnEvent<this>;
-
-  functions: {
-    balanceOf(
-      _owner: PromiseOrValue<string>,
-      _id: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<[BigNumber]>;
-
-    uri(
-      _id: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<[string]>;
-  };
-
-  balanceOf(
-    _owner: PromiseOrValue<string>,
-    _id: PromiseOrValue<BigNumberish>,
-    overrides?: CallOverrides
-  ): Promise<BigNumber>;
-
-  uri(
-    _id: PromiseOrValue<BigNumberish>,
-    overrides?: CallOverrides
-  ): Promise<string>;
-
-  callStatic: {
-    balanceOf(
-      _owner: PromiseOrValue<string>,
-      _id: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    uri(
-      _id: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<string>;
-  };
-
-  filters: {};
-
-  estimateGas: {
-    balanceOf(
-      _owner: PromiseOrValue<string>,
-      _id: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    uri(
-      _id: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-  };
-
-  populateTransaction: {
-    balanceOf(
-      _owner: PromiseOrValue<string>,
-      _id: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    uri(
-      _id: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-  };
-}
diff --git a/src/legacy/abis/types/Erc20.d.ts b/src/legacy/abis/types/Erc20.d.ts
deleted file mode 100644
index d62e55ac0b..0000000000
--- a/src/legacy/abis/types/Erc20.d.ts
+++ /dev/null
@@ -1,366 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-
-import {
-  ethers,
-  EventFilter,
-  Signer,
-  BigNumber,
-  BigNumberish,
-  PopulatedTransaction,
-  BaseContract,
-  ContractTransaction,
-  Overrides,
-  CallOverrides,
-} from "ethers";
-import { BytesLike } from "@ethersproject/bytes";
-import { Listener, Provider } from "@ethersproject/providers";
-import { FunctionFragment, EventFragment, Result } from "@ethersproject/abi";
-import type { TypedEventFilter, TypedEvent, TypedListener } from "./common";
-
-interface Erc20Interface extends ethers.utils.Interface {
-  functions: {
-    "name()": FunctionFragment;
-    "approve(address,uint256)": FunctionFragment;
-    "totalSupply()": FunctionFragment;
-    "transferFrom(address,address,uint256)": FunctionFragment;
-    "decimals()": FunctionFragment;
-    "balanceOf(address)": FunctionFragment;
-    "symbol()": FunctionFragment;
-    "transfer(address,uint256)": FunctionFragment;
-    "allowance(address,address)": FunctionFragment;
-  };
-
-  encodeFunctionData(functionFragment: "name", values?: undefined): string;
-  encodeFunctionData(
-    functionFragment: "approve",
-    values: [string, BigNumberish]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "totalSupply",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "transferFrom",
-    values: [string, string, BigNumberish]
-  ): string;
-  encodeFunctionData(functionFragment: "decimals", values?: undefined): string;
-  encodeFunctionData(functionFragment: "balanceOf", values: [string]): string;
-  encodeFunctionData(functionFragment: "symbol", values?: undefined): string;
-  encodeFunctionData(
-    functionFragment: "transfer",
-    values: [string, BigNumberish]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "allowance",
-    values: [string, string]
-  ): string;
-
-  decodeFunctionResult(functionFragment: "name", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "approve", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "totalSupply",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "transferFrom",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "decimals", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "balanceOf", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "symbol", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "transfer", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "allowance", data: BytesLike): Result;
-
-  events: {
-    "Approval(address,address,uint256)": EventFragment;
-    "Transfer(address,address,uint256)": EventFragment;
-  };
-
-  getEvent(nameOrSignatureOrTopic: "Approval"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "Transfer"): EventFragment;
-}
-
-export type ApprovalEvent = TypedEvent<
-  [string, string, BigNumber] & {
-    owner: string;
-    spender: string;
-    value: BigNumber;
-  }
->;
-
-export type TransferEvent = TypedEvent<
-  [string, string, BigNumber] & { from: string; to: string; value: BigNumber }
->;
-
-export class Erc20 extends BaseContract {
-  connect(signerOrProvider: Signer | Provider | string): this;
-  attach(addressOrName: string): this;
-  deployed(): Promise<this>;
-
-  listeners<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter?: TypedEventFilter<EventArgsArray, EventArgsObject>
-  ): Array<TypedListener<EventArgsArray, EventArgsObject>>;
-  off<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    listener: TypedListener<EventArgsArray, EventArgsObject>
-  ): this;
-  on<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    listener: TypedListener<EventArgsArray, EventArgsObject>
-  ): this;
-  once<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    listener: TypedListener<EventArgsArray, EventArgsObject>
-  ): this;
-  removeListener<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    listener: TypedListener<EventArgsArray, EventArgsObject>
-  ): this;
-  removeAllListeners<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>
-  ): this;
-
-  listeners(eventName?: string): Array<Listener>;
-  off(eventName: string, listener: Listener): this;
-  on(eventName: string, listener: Listener): this;
-  once(eventName: string, listener: Listener): this;
-  removeListener(eventName: string, listener: Listener): this;
-  removeAllListeners(eventName?: string): this;
-
-  queryFilter<EventArgsArray extends Array<any>, EventArgsObject>(
-    event: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    fromBlockOrBlockhash?: string | number | undefined,
-    toBlock?: string | number | undefined
-  ): Promise<Array<TypedEvent<EventArgsArray & EventArgsObject>>>;
-
-  interface: Erc20Interface;
-
-  functions: {
-    name(overrides?: CallOverrides): Promise<[string]>;
-
-    approve(
-      _spender: string,
-      _value: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    totalSupply(overrides?: CallOverrides): Promise<[BigNumber]>;
-
-    transferFrom(
-      _from: string,
-      _to: string,
-      _value: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    decimals(overrides?: CallOverrides): Promise<[number]>;
-
-    balanceOf(
-      _owner: string,
-      overrides?: CallOverrides
-    ): Promise<[BigNumber] & { balance: BigNumber }>;
-
-    symbol(overrides?: CallOverrides): Promise<[string]>;
-
-    transfer(
-      _to: string,
-      _value: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    allowance(
-      _owner: string,
-      _spender: string,
-      overrides?: CallOverrides
-    ): Promise<[BigNumber]>;
-  };
-
-  name(overrides?: CallOverrides): Promise<string>;
-
-  approve(
-    _spender: string,
-    _value: BigNumberish,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  totalSupply(overrides?: CallOverrides): Promise<BigNumber>;
-
-  transferFrom(
-    _from: string,
-    _to: string,
-    _value: BigNumberish,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  decimals(overrides?: CallOverrides): Promise<number>;
-
-  balanceOf(_owner: string, overrides?: CallOverrides): Promise<BigNumber>;
-
-  symbol(overrides?: CallOverrides): Promise<string>;
-
-  transfer(
-    _to: string,
-    _value: BigNumberish,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  allowance(
-    _owner: string,
-    _spender: string,
-    overrides?: CallOverrides
-  ): Promise<BigNumber>;
-
-  callStatic: {
-    name(overrides?: CallOverrides): Promise<string>;
-
-    approve(
-      _spender: string,
-      _value: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<boolean>;
-
-    totalSupply(overrides?: CallOverrides): Promise<BigNumber>;
-
-    transferFrom(
-      _from: string,
-      _to: string,
-      _value: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<boolean>;
-
-    decimals(overrides?: CallOverrides): Promise<number>;
-
-    balanceOf(_owner: string, overrides?: CallOverrides): Promise<BigNumber>;
-
-    symbol(overrides?: CallOverrides): Promise<string>;
-
-    transfer(
-      _to: string,
-      _value: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<boolean>;
-
-    allowance(
-      _owner: string,
-      _spender: string,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-  };
-
-  filters: {
-    "Approval(address,address,uint256)"(
-      owner?: string | null,
-      spender?: string | null,
-      value?: null
-    ): TypedEventFilter<
-      [string, string, BigNumber],
-      { owner: string; spender: string; value: BigNumber }
-    >;
-
-    Approval(
-      owner?: string | null,
-      spender?: string | null,
-      value?: null
-    ): TypedEventFilter<
-      [string, string, BigNumber],
-      { owner: string; spender: string; value: BigNumber }
-    >;
-
-    "Transfer(address,address,uint256)"(
-      from?: string | null,
-      to?: string | null,
-      value?: null
-    ): TypedEventFilter<
-      [string, string, BigNumber],
-      { from: string; to: string; value: BigNumber }
-    >;
-
-    Transfer(
-      from?: string | null,
-      to?: string | null,
-      value?: null
-    ): TypedEventFilter<
-      [string, string, BigNumber],
-      { from: string; to: string; value: BigNumber }
-    >;
-  };
-
-  estimateGas: {
-    name(overrides?: CallOverrides): Promise<BigNumber>;
-
-    approve(
-      _spender: string,
-      _value: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    totalSupply(overrides?: CallOverrides): Promise<BigNumber>;
-
-    transferFrom(
-      _from: string,
-      _to: string,
-      _value: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    decimals(overrides?: CallOverrides): Promise<BigNumber>;
-
-    balanceOf(_owner: string, overrides?: CallOverrides): Promise<BigNumber>;
-
-    symbol(overrides?: CallOverrides): Promise<BigNumber>;
-
-    transfer(
-      _to: string,
-      _value: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    allowance(
-      _owner: string,
-      _spender: string,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-  };
-
-  populateTransaction: {
-    name(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    approve(
-      _spender: string,
-      _value: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    totalSupply(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    transferFrom(
-      _from: string,
-      _to: string,
-      _value: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    decimals(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    balanceOf(
-      _owner: string,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    symbol(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    transfer(
-      _to: string,
-      _value: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    allowance(
-      _owner: string,
-      _spender: string,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-  };
-}
diff --git a/src/legacy/abis/types/Erc20.ts b/src/legacy/abis/types/Erc20.ts
deleted file mode 100644
index 42b7fdee89..0000000000
--- a/src/legacy/abis/types/Erc20.ts
+++ /dev/null
@@ -1,384 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-import type {
-  BaseContract,
-  BigNumber,
-  BigNumberish,
-  BytesLike,
-  CallOverrides,
-  ContractTransaction,
-  Overrides,
-  PopulatedTransaction,
-  Signer,
-  utils,
-} from "ethers";
-import type {
-  FunctionFragment,
-  Result,
-  EventFragment,
-} from "@ethersproject/abi";
-import type { Listener, Provider } from "@ethersproject/providers";
-import type {
-  TypedEventFilter,
-  TypedEvent,
-  TypedListener,
-  OnEvent,
-  PromiseOrValue,
-} from "./common";
-
-export interface Erc20Interface extends utils.Interface {
-  functions: {
-    "name()": FunctionFragment;
-    "approve(address,uint256)": FunctionFragment;
-    "totalSupply()": FunctionFragment;
-    "transferFrom(address,address,uint256)": FunctionFragment;
-    "decimals()": FunctionFragment;
-    "balanceOf(address)": FunctionFragment;
-    "symbol()": FunctionFragment;
-    "transfer(address,uint256)": FunctionFragment;
-    "allowance(address,address)": FunctionFragment;
-  };
-
-  getFunction(
-    nameOrSignatureOrTopic:
-      | "name"
-      | "approve"
-      | "totalSupply"
-      | "transferFrom"
-      | "decimals"
-      | "balanceOf"
-      | "symbol"
-      | "transfer"
-      | "allowance"
-  ): FunctionFragment;
-
-  encodeFunctionData(functionFragment: "name", values?: undefined): string;
-  encodeFunctionData(
-    functionFragment: "approve",
-    values: [PromiseOrValue<string>, PromiseOrValue<BigNumberish>]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "totalSupply",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "transferFrom",
-    values: [
-      PromiseOrValue<string>,
-      PromiseOrValue<string>,
-      PromiseOrValue<BigNumberish>
-    ]
-  ): string;
-  encodeFunctionData(functionFragment: "decimals", values?: undefined): string;
-  encodeFunctionData(
-    functionFragment: "balanceOf",
-    values: [PromiseOrValue<string>]
-  ): string;
-  encodeFunctionData(functionFragment: "symbol", values?: undefined): string;
-  encodeFunctionData(
-    functionFragment: "transfer",
-    values: [PromiseOrValue<string>, PromiseOrValue<BigNumberish>]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "allowance",
-    values: [PromiseOrValue<string>, PromiseOrValue<string>]
-  ): string;
-
-  decodeFunctionResult(functionFragment: "name", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "approve", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "totalSupply",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "transferFrom",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "decimals", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "balanceOf", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "symbol", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "transfer", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "allowance", data: BytesLike): Result;
-
-  events: {
-    "Approval(address,address,uint256)": EventFragment;
-    "Transfer(address,address,uint256)": EventFragment;
-  };
-
-  getEvent(nameOrSignatureOrTopic: "Approval"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "Transfer"): EventFragment;
-}
-
-export interface ApprovalEventObject {
-  owner: string;
-  spender: string;
-  value: BigNumber;
-}
-export type ApprovalEvent = TypedEvent<
-  [string, string, BigNumber],
-  ApprovalEventObject
->;
-
-export type ApprovalEventFilter = TypedEventFilter<ApprovalEvent>;
-
-export interface TransferEventObject {
-  from: string;
-  to: string;
-  value: BigNumber;
-}
-export type TransferEvent = TypedEvent<
-  [string, string, BigNumber],
-  TransferEventObject
->;
-
-export type TransferEventFilter = TypedEventFilter<TransferEvent>;
-
-export interface Erc20 extends BaseContract {
-  connect(signerOrProvider: Signer | Provider | string): this;
-  attach(addressOrName: string): this;
-  deployed(): Promise<this>;
-
-  interface: Erc20Interface;
-
-  queryFilter<TEvent extends TypedEvent>(
-    event: TypedEventFilter<TEvent>,
-    fromBlockOrBlockhash?: string | number | undefined,
-    toBlock?: string | number | undefined
-  ): Promise<Array<TEvent>>;
-
-  listeners<TEvent extends TypedEvent>(
-    eventFilter?: TypedEventFilter<TEvent>
-  ): Array<TypedListener<TEvent>>;
-  listeners(eventName?: string): Array<Listener>;
-  removeAllListeners<TEvent extends TypedEvent>(
-    eventFilter: TypedEventFilter<TEvent>
-  ): this;
-  removeAllListeners(eventName?: string): this;
-  off: OnEvent<this>;
-  on: OnEvent<this>;
-  once: OnEvent<this>;
-  removeListener: OnEvent<this>;
-
-  functions: {
-    name(overrides?: CallOverrides): Promise<[string]>;
-
-    approve(
-      _spender: PromiseOrValue<string>,
-      _value: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<ContractTransaction>;
-
-    totalSupply(overrides?: CallOverrides): Promise<[BigNumber]>;
-
-    transferFrom(
-      _from: PromiseOrValue<string>,
-      _to: PromiseOrValue<string>,
-      _value: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<ContractTransaction>;
-
-    decimals(overrides?: CallOverrides): Promise<[number]>;
-
-    balanceOf(
-      _owner: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<[BigNumber] & { balance: BigNumber }>;
-
-    symbol(overrides?: CallOverrides): Promise<[string]>;
-
-    transfer(
-      _to: PromiseOrValue<string>,
-      _value: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<ContractTransaction>;
-
-    allowance(
-      _owner: PromiseOrValue<string>,
-      _spender: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<[BigNumber]>;
-  };
-
-  name(overrides?: CallOverrides): Promise<string>;
-
-  approve(
-    _spender: PromiseOrValue<string>,
-    _value: PromiseOrValue<BigNumberish>,
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
-  ): Promise<ContractTransaction>;
-
-  totalSupply(overrides?: CallOverrides): Promise<BigNumber>;
-
-  transferFrom(
-    _from: PromiseOrValue<string>,
-    _to: PromiseOrValue<string>,
-    _value: PromiseOrValue<BigNumberish>,
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
-  ): Promise<ContractTransaction>;
-
-  decimals(overrides?: CallOverrides): Promise<number>;
-
-  balanceOf(
-    _owner: PromiseOrValue<string>,
-    overrides?: CallOverrides
-  ): Promise<BigNumber>;
-
-  symbol(overrides?: CallOverrides): Promise<string>;
-
-  transfer(
-    _to: PromiseOrValue<string>,
-    _value: PromiseOrValue<BigNumberish>,
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
-  ): Promise<ContractTransaction>;
-
-  allowance(
-    _owner: PromiseOrValue<string>,
-    _spender: PromiseOrValue<string>,
-    overrides?: CallOverrides
-  ): Promise<BigNumber>;
-
-  callStatic: {
-    name(overrides?: CallOverrides): Promise<string>;
-
-    approve(
-      _spender: PromiseOrValue<string>,
-      _value: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<boolean>;
-
-    totalSupply(overrides?: CallOverrides): Promise<BigNumber>;
-
-    transferFrom(
-      _from: PromiseOrValue<string>,
-      _to: PromiseOrValue<string>,
-      _value: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<boolean>;
-
-    decimals(overrides?: CallOverrides): Promise<number>;
-
-    balanceOf(
-      _owner: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    symbol(overrides?: CallOverrides): Promise<string>;
-
-    transfer(
-      _to: PromiseOrValue<string>,
-      _value: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<boolean>;
-
-    allowance(
-      _owner: PromiseOrValue<string>,
-      _spender: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-  };
-
-  filters: {
-    "Approval(address,address,uint256)"(
-      owner?: PromiseOrValue<string> | null,
-      spender?: PromiseOrValue<string> | null,
-      value?: null
-    ): ApprovalEventFilter;
-    Approval(
-      owner?: PromiseOrValue<string> | null,
-      spender?: PromiseOrValue<string> | null,
-      value?: null
-    ): ApprovalEventFilter;
-
-    "Transfer(address,address,uint256)"(
-      from?: PromiseOrValue<string> | null,
-      to?: PromiseOrValue<string> | null,
-      value?: null
-    ): TransferEventFilter;
-    Transfer(
-      from?: PromiseOrValue<string> | null,
-      to?: PromiseOrValue<string> | null,
-      value?: null
-    ): TransferEventFilter;
-  };
-
-  estimateGas: {
-    name(overrides?: CallOverrides): Promise<BigNumber>;
-
-    approve(
-      _spender: PromiseOrValue<string>,
-      _value: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<BigNumber>;
-
-    totalSupply(overrides?: CallOverrides): Promise<BigNumber>;
-
-    transferFrom(
-      _from: PromiseOrValue<string>,
-      _to: PromiseOrValue<string>,
-      _value: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<BigNumber>;
-
-    decimals(overrides?: CallOverrides): Promise<BigNumber>;
-
-    balanceOf(
-      _owner: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    symbol(overrides?: CallOverrides): Promise<BigNumber>;
-
-    transfer(
-      _to: PromiseOrValue<string>,
-      _value: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<BigNumber>;
-
-    allowance(
-      _owner: PromiseOrValue<string>,
-      _spender: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-  };
-
-  populateTransaction: {
-    name(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    approve(
-      _spender: PromiseOrValue<string>,
-      _value: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<PopulatedTransaction>;
-
-    totalSupply(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    transferFrom(
-      _from: PromiseOrValue<string>,
-      _to: PromiseOrValue<string>,
-      _value: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<PopulatedTransaction>;
-
-    decimals(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    balanceOf(
-      _owner: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    symbol(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    transfer(
-      _to: PromiseOrValue<string>,
-      _value: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<PopulatedTransaction>;
-
-    allowance(
-      _owner: PromiseOrValue<string>,
-      _spender: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-  };
-}
diff --git a/src/legacy/abis/types/Erc20Bytes32.d.ts b/src/legacy/abis/types/Erc20Bytes32.d.ts
deleted file mode 100644
index a2034d6d0a..0000000000
--- a/src/legacy/abis/types/Erc20Bytes32.d.ts
+++ /dev/null
@@ -1,108 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-
-import {
-  ethers,
-  EventFilter,
-  Signer,
-  BigNumber,
-  BigNumberish,
-  PopulatedTransaction,
-  BaseContract,
-  ContractTransaction,
-  CallOverrides,
-} from "ethers";
-import { BytesLike } from "@ethersproject/bytes";
-import { Listener, Provider } from "@ethersproject/providers";
-import { FunctionFragment, EventFragment, Result } from "@ethersproject/abi";
-import type { TypedEventFilter, TypedEvent, TypedListener } from "./common";
-
-interface Erc20Bytes32Interface extends ethers.utils.Interface {
-  functions: {
-    "name()": FunctionFragment;
-    "symbol()": FunctionFragment;
-  };
-
-  encodeFunctionData(functionFragment: "name", values?: undefined): string;
-  encodeFunctionData(functionFragment: "symbol", values?: undefined): string;
-
-  decodeFunctionResult(functionFragment: "name", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "symbol", data: BytesLike): Result;
-
-  events: {};
-}
-
-export class Erc20Bytes32 extends BaseContract {
-  connect(signerOrProvider: Signer | Provider | string): this;
-  attach(addressOrName: string): this;
-  deployed(): Promise<this>;
-
-  listeners<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter?: TypedEventFilter<EventArgsArray, EventArgsObject>
-  ): Array<TypedListener<EventArgsArray, EventArgsObject>>;
-  off<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    listener: TypedListener<EventArgsArray, EventArgsObject>
-  ): this;
-  on<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    listener: TypedListener<EventArgsArray, EventArgsObject>
-  ): this;
-  once<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    listener: TypedListener<EventArgsArray, EventArgsObject>
-  ): this;
-  removeListener<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    listener: TypedListener<EventArgsArray, EventArgsObject>
-  ): this;
-  removeAllListeners<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>
-  ): this;
-
-  listeners(eventName?: string): Array<Listener>;
-  off(eventName: string, listener: Listener): this;
-  on(eventName: string, listener: Listener): this;
-  once(eventName: string, listener: Listener): this;
-  removeListener(eventName: string, listener: Listener): this;
-  removeAllListeners(eventName?: string): this;
-
-  queryFilter<EventArgsArray extends Array<any>, EventArgsObject>(
-    event: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    fromBlockOrBlockhash?: string | number | undefined,
-    toBlock?: string | number | undefined
-  ): Promise<Array<TypedEvent<EventArgsArray & EventArgsObject>>>;
-
-  interface: Erc20Bytes32Interface;
-
-  functions: {
-    name(overrides?: CallOverrides): Promise<[string]>;
-
-    symbol(overrides?: CallOverrides): Promise<[string]>;
-  };
-
-  name(overrides?: CallOverrides): Promise<string>;
-
-  symbol(overrides?: CallOverrides): Promise<string>;
-
-  callStatic: {
-    name(overrides?: CallOverrides): Promise<string>;
-
-    symbol(overrides?: CallOverrides): Promise<string>;
-  };
-
-  filters: {};
-
-  estimateGas: {
-    name(overrides?: CallOverrides): Promise<BigNumber>;
-
-    symbol(overrides?: CallOverrides): Promise<BigNumber>;
-  };
-
-  populateTransaction: {
-    name(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    symbol(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-  };
-}
diff --git a/src/legacy/abis/types/Erc20_bytes32.ts b/src/legacy/abis/types/Erc20_bytes32.ts
deleted file mode 100644
index f6e7d3ef87..0000000000
--- a/src/legacy/abis/types/Erc20_bytes32.ts
+++ /dev/null
@@ -1,95 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-import type {
-  BaseContract,
-  BigNumber,
-  BytesLike,
-  CallOverrides,
-  PopulatedTransaction,
-  Signer,
-  utils,
-} from "ethers";
-import type { FunctionFragment, Result } from "@ethersproject/abi";
-import type { Listener, Provider } from "@ethersproject/providers";
-import type {
-  TypedEventFilter,
-  TypedEvent,
-  TypedListener,
-  OnEvent,
-  PromiseOrValue,
-} from "./common";
-
-export interface Erc20_bytes32Interface extends utils.Interface {
-  functions: {
-    "name()": FunctionFragment;
-    "symbol()": FunctionFragment;
-  };
-
-  getFunction(nameOrSignatureOrTopic: "name" | "symbol"): FunctionFragment;
-
-  encodeFunctionData(functionFragment: "name", values?: undefined): string;
-  encodeFunctionData(functionFragment: "symbol", values?: undefined): string;
-
-  decodeFunctionResult(functionFragment: "name", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "symbol", data: BytesLike): Result;
-
-  events: {};
-}
-
-export interface Erc20_bytes32 extends BaseContract {
-  connect(signerOrProvider: Signer | Provider | string): this;
-  attach(addressOrName: string): this;
-  deployed(): Promise<this>;
-
-  interface: Erc20_bytes32Interface;
-
-  queryFilter<TEvent extends TypedEvent>(
-    event: TypedEventFilter<TEvent>,
-    fromBlockOrBlockhash?: string | number | undefined,
-    toBlock?: string | number | undefined
-  ): Promise<Array<TEvent>>;
-
-  listeners<TEvent extends TypedEvent>(
-    eventFilter?: TypedEventFilter<TEvent>
-  ): Array<TypedListener<TEvent>>;
-  listeners(eventName?: string): Array<Listener>;
-  removeAllListeners<TEvent extends TypedEvent>(
-    eventFilter: TypedEventFilter<TEvent>
-  ): this;
-  removeAllListeners(eventName?: string): this;
-  off: OnEvent<this>;
-  on: OnEvent<this>;
-  once: OnEvent<this>;
-  removeListener: OnEvent<this>;
-
-  functions: {
-    name(overrides?: CallOverrides): Promise<[string]>;
-
-    symbol(overrides?: CallOverrides): Promise<[string]>;
-  };
-
-  name(overrides?: CallOverrides): Promise<string>;
-
-  symbol(overrides?: CallOverrides): Promise<string>;
-
-  callStatic: {
-    name(overrides?: CallOverrides): Promise<string>;
-
-    symbol(overrides?: CallOverrides): Promise<string>;
-  };
-
-  filters: {};
-
-  estimateGas: {
-    name(overrides?: CallOverrides): Promise<BigNumber>;
-
-    symbol(overrides?: CallOverrides): Promise<BigNumber>;
-  };
-
-  populateTransaction: {
-    name(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    symbol(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-  };
-}
diff --git a/src/legacy/abis/types/Erc721.d.ts b/src/legacy/abis/types/Erc721.d.ts
deleted file mode 100644
index ed0cffce35..0000000000
--- a/src/legacy/abis/types/Erc721.d.ts
+++ /dev/null
@@ -1,132 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-
-import {
-  ethers,
-  EventFilter,
-  Signer,
-  BigNumber,
-  BigNumberish,
-  PopulatedTransaction,
-  BaseContract,
-  ContractTransaction,
-  CallOverrides,
-} from "ethers";
-import { BytesLike } from "@ethersproject/bytes";
-import { Listener, Provider } from "@ethersproject/providers";
-import { FunctionFragment, EventFragment, Result } from "@ethersproject/abi";
-import type { TypedEventFilter, TypedEvent, TypedListener } from "./common";
-
-interface Erc721Interface extends ethers.utils.Interface {
-  functions: {
-    "ownerOf(uint256)": FunctionFragment;
-    "tokenURI(uint256)": FunctionFragment;
-  };
-
-  encodeFunctionData(
-    functionFragment: "ownerOf",
-    values: [BigNumberish]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "tokenURI",
-    values: [BigNumberish]
-  ): string;
-
-  decodeFunctionResult(functionFragment: "ownerOf", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "tokenURI", data: BytesLike): Result;
-
-  events: {};
-}
-
-export class Erc721 extends BaseContract {
-  connect(signerOrProvider: Signer | Provider | string): this;
-  attach(addressOrName: string): this;
-  deployed(): Promise<this>;
-
-  listeners<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter?: TypedEventFilter<EventArgsArray, EventArgsObject>
-  ): Array<TypedListener<EventArgsArray, EventArgsObject>>;
-  off<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    listener: TypedListener<EventArgsArray, EventArgsObject>
-  ): this;
-  on<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    listener: TypedListener<EventArgsArray, EventArgsObject>
-  ): this;
-  once<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    listener: TypedListener<EventArgsArray, EventArgsObject>
-  ): this;
-  removeListener<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    listener: TypedListener<EventArgsArray, EventArgsObject>
-  ): this;
-  removeAllListeners<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>
-  ): this;
-
-  listeners(eventName?: string): Array<Listener>;
-  off(eventName: string, listener: Listener): this;
-  on(eventName: string, listener: Listener): this;
-  once(eventName: string, listener: Listener): this;
-  removeListener(eventName: string, listener: Listener): this;
-  removeAllListeners(eventName?: string): this;
-
-  queryFilter<EventArgsArray extends Array<any>, EventArgsObject>(
-    event: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    fromBlockOrBlockhash?: string | number | undefined,
-    toBlock?: string | number | undefined
-  ): Promise<Array<TypedEvent<EventArgsArray & EventArgsObject>>>;
-
-  interface: Erc721Interface;
-
-  functions: {
-    ownerOf(
-      tokenId: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<[string]>;
-
-    tokenURI(
-      tokenId: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<[string]>;
-  };
-
-  ownerOf(tokenId: BigNumberish, overrides?: CallOverrides): Promise<string>;
-
-  tokenURI(tokenId: BigNumberish, overrides?: CallOverrides): Promise<string>;
-
-  callStatic: {
-    ownerOf(tokenId: BigNumberish, overrides?: CallOverrides): Promise<string>;
-
-    tokenURI(tokenId: BigNumberish, overrides?: CallOverrides): Promise<string>;
-  };
-
-  filters: {};
-
-  estimateGas: {
-    ownerOf(
-      tokenId: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    tokenURI(
-      tokenId: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-  };
-
-  populateTransaction: {
-    ownerOf(
-      tokenId: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    tokenURI(
-      tokenId: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-  };
-}
diff --git a/src/legacy/abis/types/Erc721.ts b/src/legacy/abis/types/Erc721.ts
deleted file mode 100644
index c2bea0757d..0000000000
--- a/src/legacy/abis/types/Erc721.ts
+++ /dev/null
@@ -1,132 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-import type {
-  BaseContract,
-  BigNumber,
-  BigNumberish,
-  BytesLike,
-  CallOverrides,
-  PopulatedTransaction,
-  Signer,
-  utils,
-} from "ethers";
-import type { FunctionFragment, Result } from "@ethersproject/abi";
-import type { Listener, Provider } from "@ethersproject/providers";
-import type {
-  TypedEventFilter,
-  TypedEvent,
-  TypedListener,
-  OnEvent,
-  PromiseOrValue,
-} from "./common";
-
-export interface Erc721Interface extends utils.Interface {
-  functions: {
-    "ownerOf(uint256)": FunctionFragment;
-    "tokenURI(uint256)": FunctionFragment;
-  };
-
-  getFunction(nameOrSignatureOrTopic: "ownerOf" | "tokenURI"): FunctionFragment;
-
-  encodeFunctionData(
-    functionFragment: "ownerOf",
-    values: [PromiseOrValue<BigNumberish>]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "tokenURI",
-    values: [PromiseOrValue<BigNumberish>]
-  ): string;
-
-  decodeFunctionResult(functionFragment: "ownerOf", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "tokenURI", data: BytesLike): Result;
-
-  events: {};
-}
-
-export interface Erc721 extends BaseContract {
-  connect(signerOrProvider: Signer | Provider | string): this;
-  attach(addressOrName: string): this;
-  deployed(): Promise<this>;
-
-  interface: Erc721Interface;
-
-  queryFilter<TEvent extends TypedEvent>(
-    event: TypedEventFilter<TEvent>,
-    fromBlockOrBlockhash?: string | number | undefined,
-    toBlock?: string | number | undefined
-  ): Promise<Array<TEvent>>;
-
-  listeners<TEvent extends TypedEvent>(
-    eventFilter?: TypedEventFilter<TEvent>
-  ): Array<TypedListener<TEvent>>;
-  listeners(eventName?: string): Array<Listener>;
-  removeAllListeners<TEvent extends TypedEvent>(
-    eventFilter: TypedEventFilter<TEvent>
-  ): this;
-  removeAllListeners(eventName?: string): this;
-  off: OnEvent<this>;
-  on: OnEvent<this>;
-  once: OnEvent<this>;
-  removeListener: OnEvent<this>;
-
-  functions: {
-    ownerOf(
-      tokenId: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<[string]>;
-
-    tokenURI(
-      tokenId: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<[string]>;
-  };
-
-  ownerOf(
-    tokenId: PromiseOrValue<BigNumberish>,
-    overrides?: CallOverrides
-  ): Promise<string>;
-
-  tokenURI(
-    tokenId: PromiseOrValue<BigNumberish>,
-    overrides?: CallOverrides
-  ): Promise<string>;
-
-  callStatic: {
-    ownerOf(
-      tokenId: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<string>;
-
-    tokenURI(
-      tokenId: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<string>;
-  };
-
-  filters: {};
-
-  estimateGas: {
-    ownerOf(
-      tokenId: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    tokenURI(
-      tokenId: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-  };
-
-  populateTransaction: {
-    ownerOf(
-      tokenId: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    tokenURI(
-      tokenId: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-  };
-}
diff --git a/src/legacy/abis/types/GovernorBravo.d.ts b/src/legacy/abis/types/GovernorBravo.d.ts
deleted file mode 100644
index 8893db45a4..0000000000
--- a/src/legacy/abis/types/GovernorBravo.d.ts
+++ /dev/null
@@ -1,1574 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-
-import {
-  ethers,
-  EventFilter,
-  Signer,
-  BigNumber,
-  BigNumberish,
-  PopulatedTransaction,
-  BaseContract,
-  ContractTransaction,
-  Overrides,
-  PayableOverrides,
-  CallOverrides,
-} from "ethers";
-import { BytesLike } from "@ethersproject/bytes";
-import { Listener, Provider } from "@ethersproject/providers";
-import { FunctionFragment, EventFragment, Result } from "@ethersproject/abi";
-import type { TypedEventFilter, TypedEvent, TypedListener } from "./common";
-
-interface GovernorBravoInterface extends ethers.utils.Interface {
-  functions: {
-    "BALLOT_TYPEHASH()": FunctionFragment;
-    "DOMAIN_TYPEHASH()": FunctionFragment;
-    "MAX_PROPOSAL_THRESHOLD()": FunctionFragment;
-    "MAX_VOTING_DELAY()": FunctionFragment;
-    "MAX_VOTING_PERIOD()": FunctionFragment;
-    "MIN_PROPOSAL_THRESHOLD()": FunctionFragment;
-    "MIN_VOTING_DELAY()": FunctionFragment;
-    "MIN_VOTING_PERIOD()": FunctionFragment;
-    "_acceptAdmin()": FunctionFragment;
-    "_initiate(uint256)": FunctionFragment;
-    "_setPendingAdmin(address)": FunctionFragment;
-    "_setProposalThreshold(uint256)": FunctionFragment;
-    "_setVotingDelay(uint256)": FunctionFragment;
-    "_setVotingPeriod(uint256)": FunctionFragment;
-    "admin()": FunctionFragment;
-    "cancel(uint256)": FunctionFragment;
-    "castVote(uint256,uint8)": FunctionFragment;
-    "castVoteBySig(uint256,uint8,uint8,bytes32,bytes32)": FunctionFragment;
-    "castVoteWithReason(uint256,uint8,string)": FunctionFragment;
-    "execute(uint256)": FunctionFragment;
-    "getActions(uint256)": FunctionFragment;
-    "getReceipt(uint256,address)": FunctionFragment;
-    "implementation()": FunctionFragment;
-    "initialProposalId()": FunctionFragment;
-    "initialize(address,address,uint256,uint256,uint256)": FunctionFragment;
-    "latestProposalIds(address)": FunctionFragment;
-    "name()": FunctionFragment;
-    "pendingAdmin()": FunctionFragment;
-    "proposalCount()": FunctionFragment;
-    "proposalMaxOperations()": FunctionFragment;
-    "proposalThreshold()": FunctionFragment;
-    "proposals(uint256)": FunctionFragment;
-    "propose(address[],uint256[],string[],bytes[],string)": FunctionFragment;
-    "queue(uint256)": FunctionFragment;
-    "quorumVotes()": FunctionFragment;
-    "state(uint256)": FunctionFragment;
-    "timelock()": FunctionFragment;
-    "uni()": FunctionFragment;
-    "votingDelay()": FunctionFragment;
-    "votingPeriod()": FunctionFragment;
-  };
-
-  encodeFunctionData(
-    functionFragment: "BALLOT_TYPEHASH",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "DOMAIN_TYPEHASH",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "MAX_PROPOSAL_THRESHOLD",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "MAX_VOTING_DELAY",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "MAX_VOTING_PERIOD",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "MIN_PROPOSAL_THRESHOLD",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "MIN_VOTING_DELAY",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "MIN_VOTING_PERIOD",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "_acceptAdmin",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "_initiate",
-    values: [BigNumberish]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "_setPendingAdmin",
-    values: [string]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "_setProposalThreshold",
-    values: [BigNumberish]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "_setVotingDelay",
-    values: [BigNumberish]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "_setVotingPeriod",
-    values: [BigNumberish]
-  ): string;
-  encodeFunctionData(functionFragment: "admin", values?: undefined): string;
-  encodeFunctionData(
-    functionFragment: "cancel",
-    values: [BigNumberish]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "castVote",
-    values: [BigNumberish, BigNumberish]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "castVoteBySig",
-    values: [BigNumberish, BigNumberish, BigNumberish, BytesLike, BytesLike]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "castVoteWithReason",
-    values: [BigNumberish, BigNumberish, string]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "execute",
-    values: [BigNumberish]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "getActions",
-    values: [BigNumberish]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "getReceipt",
-    values: [BigNumberish, string]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "implementation",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "initialProposalId",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "initialize",
-    values: [string, string, BigNumberish, BigNumberish, BigNumberish]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "latestProposalIds",
-    values: [string]
-  ): string;
-  encodeFunctionData(functionFragment: "name", values?: undefined): string;
-  encodeFunctionData(
-    functionFragment: "pendingAdmin",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "proposalCount",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "proposalMaxOperations",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "proposalThreshold",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "proposals",
-    values: [BigNumberish]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "propose",
-    values: [string[], BigNumberish[], string[], BytesLike[], string]
-  ): string;
-  encodeFunctionData(functionFragment: "queue", values: [BigNumberish]): string;
-  encodeFunctionData(
-    functionFragment: "quorumVotes",
-    values?: undefined
-  ): string;
-  encodeFunctionData(functionFragment: "state", values: [BigNumberish]): string;
-  encodeFunctionData(functionFragment: "timelock", values?: undefined): string;
-  encodeFunctionData(functionFragment: "uni", values?: undefined): string;
-  encodeFunctionData(
-    functionFragment: "votingDelay",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "votingPeriod",
-    values?: undefined
-  ): string;
-
-  decodeFunctionResult(
-    functionFragment: "BALLOT_TYPEHASH",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "DOMAIN_TYPEHASH",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "MAX_PROPOSAL_THRESHOLD",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "MAX_VOTING_DELAY",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "MAX_VOTING_PERIOD",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "MIN_PROPOSAL_THRESHOLD",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "MIN_VOTING_DELAY",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "MIN_VOTING_PERIOD",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "_acceptAdmin",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "_initiate", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "_setPendingAdmin",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "_setProposalThreshold",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "_setVotingDelay",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "_setVotingPeriod",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "admin", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "cancel", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "castVote", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "castVoteBySig",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "castVoteWithReason",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "execute", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "getActions", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "getReceipt", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "implementation",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "initialProposalId",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "initialize", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "latestProposalIds",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "name", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "pendingAdmin",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "proposalCount",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "proposalMaxOperations",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "proposalThreshold",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "proposals", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "propose", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "queue", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "quorumVotes",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "state", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "timelock", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "uni", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "votingDelay",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "votingPeriod",
-    data: BytesLike
-  ): Result;
-
-  events: {
-    "NewAdmin(address,address)": EventFragment;
-    "NewImplementation(address,address)": EventFragment;
-    "NewPendingAdmin(address,address)": EventFragment;
-    "ProposalCanceled(uint256)": EventFragment;
-    "ProposalCreated(uint256,address,address[],uint256[],string[],bytes[],uint256,uint256,string)": EventFragment;
-    "ProposalExecuted(uint256)": EventFragment;
-    "ProposalQueued(uint256,uint256)": EventFragment;
-    "ProposalThresholdSet(uint256,uint256)": EventFragment;
-    "VoteCast(address,uint256,uint8,uint256,string)": EventFragment;
-    "VotingDelaySet(uint256,uint256)": EventFragment;
-    "VotingPeriodSet(uint256,uint256)": EventFragment;
-  };
-
-  getEvent(nameOrSignatureOrTopic: "NewAdmin"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "NewImplementation"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "NewPendingAdmin"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "ProposalCanceled"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "ProposalCreated"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "ProposalExecuted"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "ProposalQueued"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "ProposalThresholdSet"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "VoteCast"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "VotingDelaySet"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "VotingPeriodSet"): EventFragment;
-}
-
-export type NewAdminEvent = TypedEvent<
-  [string, string] & { oldAdmin: string; newAdmin: string }
->;
-
-export type NewImplementationEvent = TypedEvent<
-  [string, string] & { oldImplementation: string; newImplementation: string }
->;
-
-export type NewPendingAdminEvent = TypedEvent<
-  [string, string] & { oldPendingAdmin: string; newPendingAdmin: string }
->;
-
-export type ProposalCanceledEvent = TypedEvent<[BigNumber] & { id: BigNumber }>;
-
-export type ProposalCreatedEvent = TypedEvent<
-  [
-    BigNumber,
-    string,
-    string[],
-    BigNumber[],
-    string[],
-    string[],
-    BigNumber,
-    BigNumber,
-    string
-  ] & {
-    id: BigNumber;
-    proposer: string;
-    targets: string[];
-    values: BigNumber[];
-    signatures: string[];
-    calldatas: string[];
-    startBlock: BigNumber;
-    endBlock: BigNumber;
-    description: string;
-  }
->;
-
-export type ProposalExecutedEvent = TypedEvent<[BigNumber] & { id: BigNumber }>;
-
-export type ProposalQueuedEvent = TypedEvent<
-  [BigNumber, BigNumber] & { id: BigNumber; eta: BigNumber }
->;
-
-export type ProposalThresholdSetEvent = TypedEvent<
-  [BigNumber, BigNumber] & {
-    oldProposalThreshold: BigNumber;
-    newProposalThreshold: BigNumber;
-  }
->;
-
-export type VoteCastEvent = TypedEvent<
-  [string, BigNumber, number, BigNumber, string] & {
-    voter: string;
-    proposalId: BigNumber;
-    support: number;
-    votes: BigNumber;
-    reason: string;
-  }
->;
-
-export type VotingDelaySetEvent = TypedEvent<
-  [BigNumber, BigNumber] & {
-    oldVotingDelay: BigNumber;
-    newVotingDelay: BigNumber;
-  }
->;
-
-export type VotingPeriodSetEvent = TypedEvent<
-  [BigNumber, BigNumber] & {
-    oldVotingPeriod: BigNumber;
-    newVotingPeriod: BigNumber;
-  }
->;
-
-export class GovernorBravo extends BaseContract {
-  connect(signerOrProvider: Signer | Provider | string): this;
-  attach(addressOrName: string): this;
-  deployed(): Promise<this>;
-
-  listeners<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter?: TypedEventFilter<EventArgsArray, EventArgsObject>
-  ): Array<TypedListener<EventArgsArray, EventArgsObject>>;
-  off<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    listener: TypedListener<EventArgsArray, EventArgsObject>
-  ): this;
-  on<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    listener: TypedListener<EventArgsArray, EventArgsObject>
-  ): this;
-  once<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    listener: TypedListener<EventArgsArray, EventArgsObject>
-  ): this;
-  removeListener<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    listener: TypedListener<EventArgsArray, EventArgsObject>
-  ): this;
-  removeAllListeners<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>
-  ): this;
-
-  listeners(eventName?: string): Array<Listener>;
-  off(eventName: string, listener: Listener): this;
-  on(eventName: string, listener: Listener): this;
-  once(eventName: string, listener: Listener): this;
-  removeListener(eventName: string, listener: Listener): this;
-  removeAllListeners(eventName?: string): this;
-
-  queryFilter<EventArgsArray extends Array<any>, EventArgsObject>(
-    event: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    fromBlockOrBlockhash?: string | number | undefined,
-    toBlock?: string | number | undefined
-  ): Promise<Array<TypedEvent<EventArgsArray & EventArgsObject>>>;
-
-  interface: GovernorBravoInterface;
-
-  functions: {
-    BALLOT_TYPEHASH(overrides?: CallOverrides): Promise<[string]>;
-
-    DOMAIN_TYPEHASH(overrides?: CallOverrides): Promise<[string]>;
-
-    MAX_PROPOSAL_THRESHOLD(overrides?: CallOverrides): Promise<[BigNumber]>;
-
-    MAX_VOTING_DELAY(overrides?: CallOverrides): Promise<[BigNumber]>;
-
-    MAX_VOTING_PERIOD(overrides?: CallOverrides): Promise<[BigNumber]>;
-
-    MIN_PROPOSAL_THRESHOLD(overrides?: CallOverrides): Promise<[BigNumber]>;
-
-    MIN_VOTING_DELAY(overrides?: CallOverrides): Promise<[BigNumber]>;
-
-    MIN_VOTING_PERIOD(overrides?: CallOverrides): Promise<[BigNumber]>;
-
-    _acceptAdmin(
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    _initiate(
-      proposalCount: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    _setPendingAdmin(
-      newPendingAdmin: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    _setProposalThreshold(
-      newProposalThreshold: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    _setVotingDelay(
-      newVotingDelay: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    _setVotingPeriod(
-      newVotingPeriod: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    admin(overrides?: CallOverrides): Promise<[string]>;
-
-    cancel(
-      proposalId: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    castVote(
-      proposalId: BigNumberish,
-      support: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    castVoteBySig(
-      proposalId: BigNumberish,
-      support: BigNumberish,
-      v: BigNumberish,
-      r: BytesLike,
-      s: BytesLike,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    castVoteWithReason(
-      proposalId: BigNumberish,
-      support: BigNumberish,
-      reason: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    execute(
-      proposalId: BigNumberish,
-      overrides?: PayableOverrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    getActions(
-      proposalId: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<
-      [string[], BigNumber[], string[], string[]] & {
-        targets: string[];
-        values: BigNumber[];
-        signatures: string[];
-        calldatas: string[];
-      }
-    >;
-
-    getReceipt(
-      proposalId: BigNumberish,
-      voter: string,
-      overrides?: CallOverrides
-    ): Promise<
-      [
-        [boolean, number, BigNumber] & {
-          hasVoted: boolean;
-          support: number;
-          votes: BigNumber;
-        }
-      ]
-    >;
-
-    implementation(overrides?: CallOverrides): Promise<[string]>;
-
-    initialProposalId(overrides?: CallOverrides): Promise<[BigNumber]>;
-
-    initialize(
-      timelock_: string,
-      uni_: string,
-      votingPeriod_: BigNumberish,
-      votingDelay_: BigNumberish,
-      proposalThreshold_: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    latestProposalIds(
-      arg0: string,
-      overrides?: CallOverrides
-    ): Promise<[BigNumber]>;
-
-    name(overrides?: CallOverrides): Promise<[string]>;
-
-    pendingAdmin(overrides?: CallOverrides): Promise<[string]>;
-
-    proposalCount(overrides?: CallOverrides): Promise<[BigNumber]>;
-
-    proposalMaxOperations(overrides?: CallOverrides): Promise<[BigNumber]>;
-
-    proposalThreshold(overrides?: CallOverrides): Promise<[BigNumber]>;
-
-    proposals(
-      arg0: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<
-      [
-        BigNumber,
-        string,
-        BigNumber,
-        BigNumber,
-        BigNumber,
-        BigNumber,
-        BigNumber,
-        BigNumber,
-        boolean,
-        boolean
-      ] & {
-        id: BigNumber;
-        proposer: string;
-        eta: BigNumber;
-        startBlock: BigNumber;
-        endBlock: BigNumber;
-        forVotes: BigNumber;
-        againstVotes: BigNumber;
-        abstainVotes: BigNumber;
-        canceled: boolean;
-        executed: boolean;
-      }
-    >;
-
-    propose(
-      targets: string[],
-      values: BigNumberish[],
-      signatures: string[],
-      calldatas: BytesLike[],
-      description: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    queue(
-      proposalId: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    quorumVotes(overrides?: CallOverrides): Promise<[BigNumber]>;
-
-    state(
-      proposalId: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<[number]>;
-
-    timelock(overrides?: CallOverrides): Promise<[string]>;
-
-    uni(overrides?: CallOverrides): Promise<[string]>;
-
-    votingDelay(overrides?: CallOverrides): Promise<[BigNumber]>;
-
-    votingPeriod(overrides?: CallOverrides): Promise<[BigNumber]>;
-  };
-
-  BALLOT_TYPEHASH(overrides?: CallOverrides): Promise<string>;
-
-  DOMAIN_TYPEHASH(overrides?: CallOverrides): Promise<string>;
-
-  MAX_PROPOSAL_THRESHOLD(overrides?: CallOverrides): Promise<BigNumber>;
-
-  MAX_VOTING_DELAY(overrides?: CallOverrides): Promise<BigNumber>;
-
-  MAX_VOTING_PERIOD(overrides?: CallOverrides): Promise<BigNumber>;
-
-  MIN_PROPOSAL_THRESHOLD(overrides?: CallOverrides): Promise<BigNumber>;
-
-  MIN_VOTING_DELAY(overrides?: CallOverrides): Promise<BigNumber>;
-
-  MIN_VOTING_PERIOD(overrides?: CallOverrides): Promise<BigNumber>;
-
-  _acceptAdmin(
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  _initiate(
-    proposalCount: BigNumberish,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  _setPendingAdmin(
-    newPendingAdmin: string,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  _setProposalThreshold(
-    newProposalThreshold: BigNumberish,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  _setVotingDelay(
-    newVotingDelay: BigNumberish,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  _setVotingPeriod(
-    newVotingPeriod: BigNumberish,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  admin(overrides?: CallOverrides): Promise<string>;
-
-  cancel(
-    proposalId: BigNumberish,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  castVote(
-    proposalId: BigNumberish,
-    support: BigNumberish,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  castVoteBySig(
-    proposalId: BigNumberish,
-    support: BigNumberish,
-    v: BigNumberish,
-    r: BytesLike,
-    s: BytesLike,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  castVoteWithReason(
-    proposalId: BigNumberish,
-    support: BigNumberish,
-    reason: string,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  execute(
-    proposalId: BigNumberish,
-    overrides?: PayableOverrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  getActions(
-    proposalId: BigNumberish,
-    overrides?: CallOverrides
-  ): Promise<
-    [string[], BigNumber[], string[], string[]] & {
-      targets: string[];
-      values: BigNumber[];
-      signatures: string[];
-      calldatas: string[];
-    }
-  >;
-
-  getReceipt(
-    proposalId: BigNumberish,
-    voter: string,
-    overrides?: CallOverrides
-  ): Promise<
-    [boolean, number, BigNumber] & {
-      hasVoted: boolean;
-      support: number;
-      votes: BigNumber;
-    }
-  >;
-
-  implementation(overrides?: CallOverrides): Promise<string>;
-
-  initialProposalId(overrides?: CallOverrides): Promise<BigNumber>;
-
-  initialize(
-    timelock_: string,
-    uni_: string,
-    votingPeriod_: BigNumberish,
-    votingDelay_: BigNumberish,
-    proposalThreshold_: BigNumberish,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  latestProposalIds(
-    arg0: string,
-    overrides?: CallOverrides
-  ): Promise<BigNumber>;
-
-  name(overrides?: CallOverrides): Promise<string>;
-
-  pendingAdmin(overrides?: CallOverrides): Promise<string>;
-
-  proposalCount(overrides?: CallOverrides): Promise<BigNumber>;
-
-  proposalMaxOperations(overrides?: CallOverrides): Promise<BigNumber>;
-
-  proposalThreshold(overrides?: CallOverrides): Promise<BigNumber>;
-
-  proposals(
-    arg0: BigNumberish,
-    overrides?: CallOverrides
-  ): Promise<
-    [
-      BigNumber,
-      string,
-      BigNumber,
-      BigNumber,
-      BigNumber,
-      BigNumber,
-      BigNumber,
-      BigNumber,
-      boolean,
-      boolean
-    ] & {
-      id: BigNumber;
-      proposer: string;
-      eta: BigNumber;
-      startBlock: BigNumber;
-      endBlock: BigNumber;
-      forVotes: BigNumber;
-      againstVotes: BigNumber;
-      abstainVotes: BigNumber;
-      canceled: boolean;
-      executed: boolean;
-    }
-  >;
-
-  propose(
-    targets: string[],
-    values: BigNumberish[],
-    signatures: string[],
-    calldatas: BytesLike[],
-    description: string,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  queue(
-    proposalId: BigNumberish,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  quorumVotes(overrides?: CallOverrides): Promise<BigNumber>;
-
-  state(proposalId: BigNumberish, overrides?: CallOverrides): Promise<number>;
-
-  timelock(overrides?: CallOverrides): Promise<string>;
-
-  uni(overrides?: CallOverrides): Promise<string>;
-
-  votingDelay(overrides?: CallOverrides): Promise<BigNumber>;
-
-  votingPeriod(overrides?: CallOverrides): Promise<BigNumber>;
-
-  callStatic: {
-    BALLOT_TYPEHASH(overrides?: CallOverrides): Promise<string>;
-
-    DOMAIN_TYPEHASH(overrides?: CallOverrides): Promise<string>;
-
-    MAX_PROPOSAL_THRESHOLD(overrides?: CallOverrides): Promise<BigNumber>;
-
-    MAX_VOTING_DELAY(overrides?: CallOverrides): Promise<BigNumber>;
-
-    MAX_VOTING_PERIOD(overrides?: CallOverrides): Promise<BigNumber>;
-
-    MIN_PROPOSAL_THRESHOLD(overrides?: CallOverrides): Promise<BigNumber>;
-
-    MIN_VOTING_DELAY(overrides?: CallOverrides): Promise<BigNumber>;
-
-    MIN_VOTING_PERIOD(overrides?: CallOverrides): Promise<BigNumber>;
-
-    _acceptAdmin(overrides?: CallOverrides): Promise<void>;
-
-    _initiate(
-      proposalCount: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    _setPendingAdmin(
-      newPendingAdmin: string,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    _setProposalThreshold(
-      newProposalThreshold: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    _setVotingDelay(
-      newVotingDelay: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    _setVotingPeriod(
-      newVotingPeriod: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    admin(overrides?: CallOverrides): Promise<string>;
-
-    cancel(proposalId: BigNumberish, overrides?: CallOverrides): Promise<void>;
-
-    castVote(
-      proposalId: BigNumberish,
-      support: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    castVoteBySig(
-      proposalId: BigNumberish,
-      support: BigNumberish,
-      v: BigNumberish,
-      r: BytesLike,
-      s: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    castVoteWithReason(
-      proposalId: BigNumberish,
-      support: BigNumberish,
-      reason: string,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    execute(proposalId: BigNumberish, overrides?: CallOverrides): Promise<void>;
-
-    getActions(
-      proposalId: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<
-      [string[], BigNumber[], string[], string[]] & {
-        targets: string[];
-        values: BigNumber[];
-        signatures: string[];
-        calldatas: string[];
-      }
-    >;
-
-    getReceipt(
-      proposalId: BigNumberish,
-      voter: string,
-      overrides?: CallOverrides
-    ): Promise<
-      [boolean, number, BigNumber] & {
-        hasVoted: boolean;
-        support: number;
-        votes: BigNumber;
-      }
-    >;
-
-    implementation(overrides?: CallOverrides): Promise<string>;
-
-    initialProposalId(overrides?: CallOverrides): Promise<BigNumber>;
-
-    initialize(
-      timelock_: string,
-      uni_: string,
-      votingPeriod_: BigNumberish,
-      votingDelay_: BigNumberish,
-      proposalThreshold_: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    latestProposalIds(
-      arg0: string,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    name(overrides?: CallOverrides): Promise<string>;
-
-    pendingAdmin(overrides?: CallOverrides): Promise<string>;
-
-    proposalCount(overrides?: CallOverrides): Promise<BigNumber>;
-
-    proposalMaxOperations(overrides?: CallOverrides): Promise<BigNumber>;
-
-    proposalThreshold(overrides?: CallOverrides): Promise<BigNumber>;
-
-    proposals(
-      arg0: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<
-      [
-        BigNumber,
-        string,
-        BigNumber,
-        BigNumber,
-        BigNumber,
-        BigNumber,
-        BigNumber,
-        BigNumber,
-        boolean,
-        boolean
-      ] & {
-        id: BigNumber;
-        proposer: string;
-        eta: BigNumber;
-        startBlock: BigNumber;
-        endBlock: BigNumber;
-        forVotes: BigNumber;
-        againstVotes: BigNumber;
-        abstainVotes: BigNumber;
-        canceled: boolean;
-        executed: boolean;
-      }
-    >;
-
-    propose(
-      targets: string[],
-      values: BigNumberish[],
-      signatures: string[],
-      calldatas: BytesLike[],
-      description: string,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    queue(proposalId: BigNumberish, overrides?: CallOverrides): Promise<void>;
-
-    quorumVotes(overrides?: CallOverrides): Promise<BigNumber>;
-
-    state(proposalId: BigNumberish, overrides?: CallOverrides): Promise<number>;
-
-    timelock(overrides?: CallOverrides): Promise<string>;
-
-    uni(overrides?: CallOverrides): Promise<string>;
-
-    votingDelay(overrides?: CallOverrides): Promise<BigNumber>;
-
-    votingPeriod(overrides?: CallOverrides): Promise<BigNumber>;
-  };
-
-  filters: {
-    "NewAdmin(address,address)"(
-      oldAdmin?: null,
-      newAdmin?: null
-    ): TypedEventFilter<
-      [string, string],
-      { oldAdmin: string; newAdmin: string }
-    >;
-
-    NewAdmin(
-      oldAdmin?: null,
-      newAdmin?: null
-    ): TypedEventFilter<
-      [string, string],
-      { oldAdmin: string; newAdmin: string }
-    >;
-
-    "NewImplementation(address,address)"(
-      oldImplementation?: null,
-      newImplementation?: null
-    ): TypedEventFilter<
-      [string, string],
-      { oldImplementation: string; newImplementation: string }
-    >;
-
-    NewImplementation(
-      oldImplementation?: null,
-      newImplementation?: null
-    ): TypedEventFilter<
-      [string, string],
-      { oldImplementation: string; newImplementation: string }
-    >;
-
-    "NewPendingAdmin(address,address)"(
-      oldPendingAdmin?: null,
-      newPendingAdmin?: null
-    ): TypedEventFilter<
-      [string, string],
-      { oldPendingAdmin: string; newPendingAdmin: string }
-    >;
-
-    NewPendingAdmin(
-      oldPendingAdmin?: null,
-      newPendingAdmin?: null
-    ): TypedEventFilter<
-      [string, string],
-      { oldPendingAdmin: string; newPendingAdmin: string }
-    >;
-
-    "ProposalCanceled(uint256)"(
-      id?: null
-    ): TypedEventFilter<[BigNumber], { id: BigNumber }>;
-
-    ProposalCanceled(
-      id?: null
-    ): TypedEventFilter<[BigNumber], { id: BigNumber }>;
-
-    "ProposalCreated(uint256,address,address[],uint256[],string[],bytes[],uint256,uint256,string)"(
-      id?: null,
-      proposer?: null,
-      targets?: null,
-      values?: null,
-      signatures?: null,
-      calldatas?: null,
-      startBlock?: null,
-      endBlock?: null,
-      description?: null
-    ): TypedEventFilter<
-      [
-        BigNumber,
-        string,
-        string[],
-        BigNumber[],
-        string[],
-        string[],
-        BigNumber,
-        BigNumber,
-        string
-      ],
-      {
-        id: BigNumber;
-        proposer: string;
-        targets: string[];
-        values: BigNumber[];
-        signatures: string[];
-        calldatas: string[];
-        startBlock: BigNumber;
-        endBlock: BigNumber;
-        description: string;
-      }
-    >;
-
-    ProposalCreated(
-      id?: null,
-      proposer?: null,
-      targets?: null,
-      values?: null,
-      signatures?: null,
-      calldatas?: null,
-      startBlock?: null,
-      endBlock?: null,
-      description?: null
-    ): TypedEventFilter<
-      [
-        BigNumber,
-        string,
-        string[],
-        BigNumber[],
-        string[],
-        string[],
-        BigNumber,
-        BigNumber,
-        string
-      ],
-      {
-        id: BigNumber;
-        proposer: string;
-        targets: string[];
-        values: BigNumber[];
-        signatures: string[];
-        calldatas: string[];
-        startBlock: BigNumber;
-        endBlock: BigNumber;
-        description: string;
-      }
-    >;
-
-    "ProposalExecuted(uint256)"(
-      id?: null
-    ): TypedEventFilter<[BigNumber], { id: BigNumber }>;
-
-    ProposalExecuted(
-      id?: null
-    ): TypedEventFilter<[BigNumber], { id: BigNumber }>;
-
-    "ProposalQueued(uint256,uint256)"(
-      id?: null,
-      eta?: null
-    ): TypedEventFilter<
-      [BigNumber, BigNumber],
-      { id: BigNumber; eta: BigNumber }
-    >;
-
-    ProposalQueued(
-      id?: null,
-      eta?: null
-    ): TypedEventFilter<
-      [BigNumber, BigNumber],
-      { id: BigNumber; eta: BigNumber }
-    >;
-
-    "ProposalThresholdSet(uint256,uint256)"(
-      oldProposalThreshold?: null,
-      newProposalThreshold?: null
-    ): TypedEventFilter<
-      [BigNumber, BigNumber],
-      { oldProposalThreshold: BigNumber; newProposalThreshold: BigNumber }
-    >;
-
-    ProposalThresholdSet(
-      oldProposalThreshold?: null,
-      newProposalThreshold?: null
-    ): TypedEventFilter<
-      [BigNumber, BigNumber],
-      { oldProposalThreshold: BigNumber; newProposalThreshold: BigNumber }
-    >;
-
-    "VoteCast(address,uint256,uint8,uint256,string)"(
-      voter?: string | null,
-      proposalId?: null,
-      support?: null,
-      votes?: null,
-      reason?: null
-    ): TypedEventFilter<
-      [string, BigNumber, number, BigNumber, string],
-      {
-        voter: string;
-        proposalId: BigNumber;
-        support: number;
-        votes: BigNumber;
-        reason: string;
-      }
-    >;
-
-    VoteCast(
-      voter?: string | null,
-      proposalId?: null,
-      support?: null,
-      votes?: null,
-      reason?: null
-    ): TypedEventFilter<
-      [string, BigNumber, number, BigNumber, string],
-      {
-        voter: string;
-        proposalId: BigNumber;
-        support: number;
-        votes: BigNumber;
-        reason: string;
-      }
-    >;
-
-    "VotingDelaySet(uint256,uint256)"(
-      oldVotingDelay?: null,
-      newVotingDelay?: null
-    ): TypedEventFilter<
-      [BigNumber, BigNumber],
-      { oldVotingDelay: BigNumber; newVotingDelay: BigNumber }
-    >;
-
-    VotingDelaySet(
-      oldVotingDelay?: null,
-      newVotingDelay?: null
-    ): TypedEventFilter<
-      [BigNumber, BigNumber],
-      { oldVotingDelay: BigNumber; newVotingDelay: BigNumber }
-    >;
-
-    "VotingPeriodSet(uint256,uint256)"(
-      oldVotingPeriod?: null,
-      newVotingPeriod?: null
-    ): TypedEventFilter<
-      [BigNumber, BigNumber],
-      { oldVotingPeriod: BigNumber; newVotingPeriod: BigNumber }
-    >;
-
-    VotingPeriodSet(
-      oldVotingPeriod?: null,
-      newVotingPeriod?: null
-    ): TypedEventFilter<
-      [BigNumber, BigNumber],
-      { oldVotingPeriod: BigNumber; newVotingPeriod: BigNumber }
-    >;
-  };
-
-  estimateGas: {
-    BALLOT_TYPEHASH(overrides?: CallOverrides): Promise<BigNumber>;
-
-    DOMAIN_TYPEHASH(overrides?: CallOverrides): Promise<BigNumber>;
-
-    MAX_PROPOSAL_THRESHOLD(overrides?: CallOverrides): Promise<BigNumber>;
-
-    MAX_VOTING_DELAY(overrides?: CallOverrides): Promise<BigNumber>;
-
-    MAX_VOTING_PERIOD(overrides?: CallOverrides): Promise<BigNumber>;
-
-    MIN_PROPOSAL_THRESHOLD(overrides?: CallOverrides): Promise<BigNumber>;
-
-    MIN_VOTING_DELAY(overrides?: CallOverrides): Promise<BigNumber>;
-
-    MIN_VOTING_PERIOD(overrides?: CallOverrides): Promise<BigNumber>;
-
-    _acceptAdmin(
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    _initiate(
-      proposalCount: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    _setPendingAdmin(
-      newPendingAdmin: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    _setProposalThreshold(
-      newProposalThreshold: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    _setVotingDelay(
-      newVotingDelay: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    _setVotingPeriod(
-      newVotingPeriod: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    admin(overrides?: CallOverrides): Promise<BigNumber>;
-
-    cancel(
-      proposalId: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    castVote(
-      proposalId: BigNumberish,
-      support: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    castVoteBySig(
-      proposalId: BigNumberish,
-      support: BigNumberish,
-      v: BigNumberish,
-      r: BytesLike,
-      s: BytesLike,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    castVoteWithReason(
-      proposalId: BigNumberish,
-      support: BigNumberish,
-      reason: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    execute(
-      proposalId: BigNumberish,
-      overrides?: PayableOverrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    getActions(
-      proposalId: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    getReceipt(
-      proposalId: BigNumberish,
-      voter: string,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    implementation(overrides?: CallOverrides): Promise<BigNumber>;
-
-    initialProposalId(overrides?: CallOverrides): Promise<BigNumber>;
-
-    initialize(
-      timelock_: string,
-      uni_: string,
-      votingPeriod_: BigNumberish,
-      votingDelay_: BigNumberish,
-      proposalThreshold_: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    latestProposalIds(
-      arg0: string,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    name(overrides?: CallOverrides): Promise<BigNumber>;
-
-    pendingAdmin(overrides?: CallOverrides): Promise<BigNumber>;
-
-    proposalCount(overrides?: CallOverrides): Promise<BigNumber>;
-
-    proposalMaxOperations(overrides?: CallOverrides): Promise<BigNumber>;
-
-    proposalThreshold(overrides?: CallOverrides): Promise<BigNumber>;
-
-    proposals(
-      arg0: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    propose(
-      targets: string[],
-      values: BigNumberish[],
-      signatures: string[],
-      calldatas: BytesLike[],
-      description: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    queue(
-      proposalId: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    quorumVotes(overrides?: CallOverrides): Promise<BigNumber>;
-
-    state(
-      proposalId: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    timelock(overrides?: CallOverrides): Promise<BigNumber>;
-
-    uni(overrides?: CallOverrides): Promise<BigNumber>;
-
-    votingDelay(overrides?: CallOverrides): Promise<BigNumber>;
-
-    votingPeriod(overrides?: CallOverrides): Promise<BigNumber>;
-  };
-
-  populateTransaction: {
-    BALLOT_TYPEHASH(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    DOMAIN_TYPEHASH(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    MAX_PROPOSAL_THRESHOLD(
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    MAX_VOTING_DELAY(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    MAX_VOTING_PERIOD(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    MIN_PROPOSAL_THRESHOLD(
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    MIN_VOTING_DELAY(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    MIN_VOTING_PERIOD(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    _acceptAdmin(
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    _initiate(
-      proposalCount: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    _setPendingAdmin(
-      newPendingAdmin: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    _setProposalThreshold(
-      newProposalThreshold: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    _setVotingDelay(
-      newVotingDelay: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    _setVotingPeriod(
-      newVotingPeriod: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    admin(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    cancel(
-      proposalId: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    castVote(
-      proposalId: BigNumberish,
-      support: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    castVoteBySig(
-      proposalId: BigNumberish,
-      support: BigNumberish,
-      v: BigNumberish,
-      r: BytesLike,
-      s: BytesLike,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    castVoteWithReason(
-      proposalId: BigNumberish,
-      support: BigNumberish,
-      reason: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    execute(
-      proposalId: BigNumberish,
-      overrides?: PayableOverrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    getActions(
-      proposalId: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    getReceipt(
-      proposalId: BigNumberish,
-      voter: string,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    implementation(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    initialProposalId(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    initialize(
-      timelock_: string,
-      uni_: string,
-      votingPeriod_: BigNumberish,
-      votingDelay_: BigNumberish,
-      proposalThreshold_: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    latestProposalIds(
-      arg0: string,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    name(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    pendingAdmin(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    proposalCount(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    proposalMaxOperations(
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    proposalThreshold(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    proposals(
-      arg0: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    propose(
-      targets: string[],
-      values: BigNumberish[],
-      signatures: string[],
-      calldatas: BytesLike[],
-      description: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    queue(
-      proposalId: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    quorumVotes(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    state(
-      proposalId: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    timelock(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    uni(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    votingDelay(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    votingPeriod(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-  };
-}
diff --git a/src/legacy/abis/types/GovernorBravo.ts b/src/legacy/abis/types/GovernorBravo.ts
deleted file mode 100644
index 48d02b8239..0000000000
--- a/src/legacy/abis/types/GovernorBravo.ts
+++ /dev/null
@@ -1,1580 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-import type {
-  BaseContract,
-  BigNumber,
-  BigNumberish,
-  BytesLike,
-  CallOverrides,
-  ContractTransaction,
-  Overrides,
-  PayableOverrides,
-  PopulatedTransaction,
-  Signer,
-  utils,
-} from "ethers";
-import type {
-  FunctionFragment,
-  Result,
-  EventFragment,
-} from "@ethersproject/abi";
-import type { Listener, Provider } from "@ethersproject/providers";
-import type {
-  TypedEventFilter,
-  TypedEvent,
-  TypedListener,
-  OnEvent,
-  PromiseOrValue,
-} from "./common";
-
-export declare namespace GovernorBravoDelegateStorageV1 {
-  export type ReceiptStruct = {
-    hasVoted: PromiseOrValue<boolean>;
-    support: PromiseOrValue<BigNumberish>;
-    votes: PromiseOrValue<BigNumberish>;
-  };
-
-  export type ReceiptStructOutput = [boolean, number, BigNumber] & {
-    hasVoted: boolean;
-    support: number;
-    votes: BigNumber;
-  };
-}
-
-export interface GovernorBravoInterface extends utils.Interface {
-  functions: {
-    "BALLOT_TYPEHASH()": FunctionFragment;
-    "DOMAIN_TYPEHASH()": FunctionFragment;
-    "MAX_PROPOSAL_THRESHOLD()": FunctionFragment;
-    "MAX_VOTING_DELAY()": FunctionFragment;
-    "MAX_VOTING_PERIOD()": FunctionFragment;
-    "MIN_PROPOSAL_THRESHOLD()": FunctionFragment;
-    "MIN_VOTING_DELAY()": FunctionFragment;
-    "MIN_VOTING_PERIOD()": FunctionFragment;
-    "_acceptAdmin()": FunctionFragment;
-    "_initiate(uint256)": FunctionFragment;
-    "_setPendingAdmin(address)": FunctionFragment;
-    "_setProposalThreshold(uint256)": FunctionFragment;
-    "_setVotingDelay(uint256)": FunctionFragment;
-    "_setVotingPeriod(uint256)": FunctionFragment;
-    "admin()": FunctionFragment;
-    "cancel(uint256)": FunctionFragment;
-    "castVote(uint256,uint8)": FunctionFragment;
-    "castVoteBySig(uint256,uint8,uint8,bytes32,bytes32)": FunctionFragment;
-    "castVoteWithReason(uint256,uint8,string)": FunctionFragment;
-    "execute(uint256)": FunctionFragment;
-    "getActions(uint256)": FunctionFragment;
-    "getReceipt(uint256,address)": FunctionFragment;
-    "implementation()": FunctionFragment;
-    "initialProposalId()": FunctionFragment;
-    "initialize(address,address,uint256,uint256,uint256)": FunctionFragment;
-    "latestProposalIds(address)": FunctionFragment;
-    "name()": FunctionFragment;
-    "pendingAdmin()": FunctionFragment;
-    "proposalCount()": FunctionFragment;
-    "proposalMaxOperations()": FunctionFragment;
-    "proposalThreshold()": FunctionFragment;
-    "proposals(uint256)": FunctionFragment;
-    "propose(address[],uint256[],string[],bytes[],string)": FunctionFragment;
-    "queue(uint256)": FunctionFragment;
-    "quorumVotes()": FunctionFragment;
-    "state(uint256)": FunctionFragment;
-    "timelock()": FunctionFragment;
-    "uni()": FunctionFragment;
-    "votingDelay()": FunctionFragment;
-    "votingPeriod()": FunctionFragment;
-  };
-
-  getFunction(
-    nameOrSignatureOrTopic:
-      | "BALLOT_TYPEHASH"
-      | "DOMAIN_TYPEHASH"
-      | "MAX_PROPOSAL_THRESHOLD"
-      | "MAX_VOTING_DELAY"
-      | "MAX_VOTING_PERIOD"
-      | "MIN_PROPOSAL_THRESHOLD"
-      | "MIN_VOTING_DELAY"
-      | "MIN_VOTING_PERIOD"
-      | "_acceptAdmin"
-      | "_initiate"
-      | "_setPendingAdmin"
-      | "_setProposalThreshold"
-      | "_setVotingDelay"
-      | "_setVotingPeriod"
-      | "admin"
-      | "cancel"
-      | "castVote"
-      | "castVoteBySig"
-      | "castVoteWithReason"
-      | "execute"
-      | "getActions"
-      | "getReceipt"
-      | "implementation"
-      | "initialProposalId"
-      | "initialize"
-      | "latestProposalIds"
-      | "name"
-      | "pendingAdmin"
-      | "proposalCount"
-      | "proposalMaxOperations"
-      | "proposalThreshold"
-      | "proposals"
-      | "propose"
-      | "queue"
-      | "quorumVotes"
-      | "state"
-      | "timelock"
-      | "uni"
-      | "votingDelay"
-      | "votingPeriod"
-  ): FunctionFragment;
-
-  encodeFunctionData(
-    functionFragment: "BALLOT_TYPEHASH",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "DOMAIN_TYPEHASH",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "MAX_PROPOSAL_THRESHOLD",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "MAX_VOTING_DELAY",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "MAX_VOTING_PERIOD",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "MIN_PROPOSAL_THRESHOLD",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "MIN_VOTING_DELAY",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "MIN_VOTING_PERIOD",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "_acceptAdmin",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "_initiate",
-    values: [PromiseOrValue<BigNumberish>]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "_setPendingAdmin",
-    values: [PromiseOrValue<string>]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "_setProposalThreshold",
-    values: [PromiseOrValue<BigNumberish>]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "_setVotingDelay",
-    values: [PromiseOrValue<BigNumberish>]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "_setVotingPeriod",
-    values: [PromiseOrValue<BigNumberish>]
-  ): string;
-  encodeFunctionData(functionFragment: "admin", values?: undefined): string;
-  encodeFunctionData(
-    functionFragment: "cancel",
-    values: [PromiseOrValue<BigNumberish>]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "castVote",
-    values: [PromiseOrValue<BigNumberish>, PromiseOrValue<BigNumberish>]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "castVoteBySig",
-    values: [
-      PromiseOrValue<BigNumberish>,
-      PromiseOrValue<BigNumberish>,
-      PromiseOrValue<BigNumberish>,
-      PromiseOrValue<BytesLike>,
-      PromiseOrValue<BytesLike>
-    ]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "castVoteWithReason",
-    values: [
-      PromiseOrValue<BigNumberish>,
-      PromiseOrValue<BigNumberish>,
-      PromiseOrValue<string>
-    ]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "execute",
-    values: [PromiseOrValue<BigNumberish>]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "getActions",
-    values: [PromiseOrValue<BigNumberish>]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "getReceipt",
-    values: [PromiseOrValue<BigNumberish>, PromiseOrValue<string>]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "implementation",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "initialProposalId",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "initialize",
-    values: [
-      PromiseOrValue<string>,
-      PromiseOrValue<string>,
-      PromiseOrValue<BigNumberish>,
-      PromiseOrValue<BigNumberish>,
-      PromiseOrValue<BigNumberish>
-    ]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "latestProposalIds",
-    values: [PromiseOrValue<string>]
-  ): string;
-  encodeFunctionData(functionFragment: "name", values?: undefined): string;
-  encodeFunctionData(
-    functionFragment: "pendingAdmin",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "proposalCount",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "proposalMaxOperations",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "proposalThreshold",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "proposals",
-    values: [PromiseOrValue<BigNumberish>]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "propose",
-    values: [
-      PromiseOrValue<string>[],
-      PromiseOrValue<BigNumberish>[],
-      PromiseOrValue<string>[],
-      PromiseOrValue<BytesLike>[],
-      PromiseOrValue<string>
-    ]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "queue",
-    values: [PromiseOrValue<BigNumberish>]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "quorumVotes",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "state",
-    values: [PromiseOrValue<BigNumberish>]
-  ): string;
-  encodeFunctionData(functionFragment: "timelock", values?: undefined): string;
-  encodeFunctionData(functionFragment: "uni", values?: undefined): string;
-  encodeFunctionData(
-    functionFragment: "votingDelay",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "votingPeriod",
-    values?: undefined
-  ): string;
-
-  decodeFunctionResult(
-    functionFragment: "BALLOT_TYPEHASH",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "DOMAIN_TYPEHASH",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "MAX_PROPOSAL_THRESHOLD",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "MAX_VOTING_DELAY",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "MAX_VOTING_PERIOD",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "MIN_PROPOSAL_THRESHOLD",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "MIN_VOTING_DELAY",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "MIN_VOTING_PERIOD",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "_acceptAdmin",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "_initiate", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "_setPendingAdmin",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "_setProposalThreshold",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "_setVotingDelay",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "_setVotingPeriod",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "admin", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "cancel", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "castVote", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "castVoteBySig",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "castVoteWithReason",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "execute", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "getActions", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "getReceipt", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "implementation",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "initialProposalId",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "initialize", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "latestProposalIds",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "name", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "pendingAdmin",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "proposalCount",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "proposalMaxOperations",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "proposalThreshold",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "proposals", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "propose", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "queue", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "quorumVotes",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "state", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "timelock", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "uni", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "votingDelay",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "votingPeriod",
-    data: BytesLike
-  ): Result;
-
-  events: {
-    "NewAdmin(address,address)": EventFragment;
-    "NewImplementation(address,address)": EventFragment;
-    "NewPendingAdmin(address,address)": EventFragment;
-    "ProposalCanceled(uint256)": EventFragment;
-    "ProposalCreated(uint256,address,address[],uint256[],string[],bytes[],uint256,uint256,string)": EventFragment;
-    "ProposalExecuted(uint256)": EventFragment;
-    "ProposalQueued(uint256,uint256)": EventFragment;
-    "ProposalThresholdSet(uint256,uint256)": EventFragment;
-    "VoteCast(address,uint256,uint8,uint256,string)": EventFragment;
-    "VotingDelaySet(uint256,uint256)": EventFragment;
-    "VotingPeriodSet(uint256,uint256)": EventFragment;
-  };
-
-  getEvent(nameOrSignatureOrTopic: "NewAdmin"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "NewImplementation"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "NewPendingAdmin"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "ProposalCanceled"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "ProposalCreated"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "ProposalExecuted"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "ProposalQueued"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "ProposalThresholdSet"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "VoteCast"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "VotingDelaySet"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "VotingPeriodSet"): EventFragment;
-}
-
-export interface NewAdminEventObject {
-  oldAdmin: string;
-  newAdmin: string;
-}
-export type NewAdminEvent = TypedEvent<[string, string], NewAdminEventObject>;
-
-export type NewAdminEventFilter = TypedEventFilter<NewAdminEvent>;
-
-export interface NewImplementationEventObject {
-  oldImplementation: string;
-  newImplementation: string;
-}
-export type NewImplementationEvent = TypedEvent<
-  [string, string],
-  NewImplementationEventObject
->;
-
-export type NewImplementationEventFilter =
-  TypedEventFilter<NewImplementationEvent>;
-
-export interface NewPendingAdminEventObject {
-  oldPendingAdmin: string;
-  newPendingAdmin: string;
-}
-export type NewPendingAdminEvent = TypedEvent<
-  [string, string],
-  NewPendingAdminEventObject
->;
-
-export type NewPendingAdminEventFilter = TypedEventFilter<NewPendingAdminEvent>;
-
-export interface ProposalCanceledEventObject {
-  id: BigNumber;
-}
-export type ProposalCanceledEvent = TypedEvent<
-  [BigNumber],
-  ProposalCanceledEventObject
->;
-
-export type ProposalCanceledEventFilter =
-  TypedEventFilter<ProposalCanceledEvent>;
-
-export interface ProposalCreatedEventObject {
-  id: BigNumber;
-  proposer: string;
-  targets: string[];
-  values: BigNumber[];
-  signatures: string[];
-  calldatas: string[];
-  startBlock: BigNumber;
-  endBlock: BigNumber;
-  description: string;
-}
-export type ProposalCreatedEvent = TypedEvent<
-  [
-    BigNumber,
-    string,
-    string[],
-    BigNumber[],
-    string[],
-    string[],
-    BigNumber,
-    BigNumber,
-    string
-  ],
-  ProposalCreatedEventObject
->;
-
-export type ProposalCreatedEventFilter = TypedEventFilter<ProposalCreatedEvent>;
-
-export interface ProposalExecutedEventObject {
-  id: BigNumber;
-}
-export type ProposalExecutedEvent = TypedEvent<
-  [BigNumber],
-  ProposalExecutedEventObject
->;
-
-export type ProposalExecutedEventFilter =
-  TypedEventFilter<ProposalExecutedEvent>;
-
-export interface ProposalQueuedEventObject {
-  id: BigNumber;
-  eta: BigNumber;
-}
-export type ProposalQueuedEvent = TypedEvent<
-  [BigNumber, BigNumber],
-  ProposalQueuedEventObject
->;
-
-export type ProposalQueuedEventFilter = TypedEventFilter<ProposalQueuedEvent>;
-
-export interface ProposalThresholdSetEventObject {
-  oldProposalThreshold: BigNumber;
-  newProposalThreshold: BigNumber;
-}
-export type ProposalThresholdSetEvent = TypedEvent<
-  [BigNumber, BigNumber],
-  ProposalThresholdSetEventObject
->;
-
-export type ProposalThresholdSetEventFilter =
-  TypedEventFilter<ProposalThresholdSetEvent>;
-
-export interface VoteCastEventObject {
-  voter: string;
-  proposalId: BigNumber;
-  support: number;
-  votes: BigNumber;
-  reason: string;
-}
-export type VoteCastEvent = TypedEvent<
-  [string, BigNumber, number, BigNumber, string],
-  VoteCastEventObject
->;
-
-export type VoteCastEventFilter = TypedEventFilter<VoteCastEvent>;
-
-export interface VotingDelaySetEventObject {
-  oldVotingDelay: BigNumber;
-  newVotingDelay: BigNumber;
-}
-export type VotingDelaySetEvent = TypedEvent<
-  [BigNumber, BigNumber],
-  VotingDelaySetEventObject
->;
-
-export type VotingDelaySetEventFilter = TypedEventFilter<VotingDelaySetEvent>;
-
-export interface VotingPeriodSetEventObject {
-  oldVotingPeriod: BigNumber;
-  newVotingPeriod: BigNumber;
-}
-export type VotingPeriodSetEvent = TypedEvent<
-  [BigNumber, BigNumber],
-  VotingPeriodSetEventObject
->;
-
-export type VotingPeriodSetEventFilter = TypedEventFilter<VotingPeriodSetEvent>;
-
-export interface GovernorBravo extends BaseContract {
-  connect(signerOrProvider: Signer | Provider | string): this;
-  attach(addressOrName: string): this;
-  deployed(): Promise<this>;
-
-  interface: GovernorBravoInterface;
-
-  queryFilter<TEvent extends TypedEvent>(
-    event: TypedEventFilter<TEvent>,
-    fromBlockOrBlockhash?: string | number | undefined,
-    toBlock?: string | number | undefined
-  ): Promise<Array<TEvent>>;
-
-  listeners<TEvent extends TypedEvent>(
-    eventFilter?: TypedEventFilter<TEvent>
-  ): Array<TypedListener<TEvent>>;
-  listeners(eventName?: string): Array<Listener>;
-  removeAllListeners<TEvent extends TypedEvent>(
-    eventFilter: TypedEventFilter<TEvent>
-  ): this;
-  removeAllListeners(eventName?: string): this;
-  off: OnEvent<this>;
-  on: OnEvent<this>;
-  once: OnEvent<this>;
-  removeListener: OnEvent<this>;
-
-  functions: {
-    BALLOT_TYPEHASH(overrides?: CallOverrides): Promise<[string]>;
-
-    DOMAIN_TYPEHASH(overrides?: CallOverrides): Promise<[string]>;
-
-    MAX_PROPOSAL_THRESHOLD(overrides?: CallOverrides): Promise<[BigNumber]>;
-
-    MAX_VOTING_DELAY(overrides?: CallOverrides): Promise<[BigNumber]>;
-
-    MAX_VOTING_PERIOD(overrides?: CallOverrides): Promise<[BigNumber]>;
-
-    MIN_PROPOSAL_THRESHOLD(overrides?: CallOverrides): Promise<[BigNumber]>;
-
-    MIN_VOTING_DELAY(overrides?: CallOverrides): Promise<[BigNumber]>;
-
-    MIN_VOTING_PERIOD(overrides?: CallOverrides): Promise<[BigNumber]>;
-
-    _acceptAdmin(
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<ContractTransaction>;
-
-    _initiate(
-      proposalCount: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<ContractTransaction>;
-
-    _setPendingAdmin(
-      newPendingAdmin: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<ContractTransaction>;
-
-    _setProposalThreshold(
-      newProposalThreshold: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<ContractTransaction>;
-
-    _setVotingDelay(
-      newVotingDelay: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<ContractTransaction>;
-
-    _setVotingPeriod(
-      newVotingPeriod: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<ContractTransaction>;
-
-    admin(overrides?: CallOverrides): Promise<[string]>;
-
-    cancel(
-      proposalId: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<ContractTransaction>;
-
-    castVote(
-      proposalId: PromiseOrValue<BigNumberish>,
-      support: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<ContractTransaction>;
-
-    castVoteBySig(
-      proposalId: PromiseOrValue<BigNumberish>,
-      support: PromiseOrValue<BigNumberish>,
-      v: PromiseOrValue<BigNumberish>,
-      r: PromiseOrValue<BytesLike>,
-      s: PromiseOrValue<BytesLike>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<ContractTransaction>;
-
-    castVoteWithReason(
-      proposalId: PromiseOrValue<BigNumberish>,
-      support: PromiseOrValue<BigNumberish>,
-      reason: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<ContractTransaction>;
-
-    execute(
-      proposalId: PromiseOrValue<BigNumberish>,
-      overrides?: PayableOverrides & { from?: PromiseOrValue<string> }
-    ): Promise<ContractTransaction>;
-
-    getActions(
-      proposalId: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<
-      [string[], BigNumber[], string[], string[]] & {
-        targets: string[];
-        values: BigNumber[];
-        signatures: string[];
-        calldatas: string[];
-      }
-    >;
-
-    getReceipt(
-      proposalId: PromiseOrValue<BigNumberish>,
-      voter: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<[GovernorBravoDelegateStorageV1.ReceiptStructOutput]>;
-
-    implementation(overrides?: CallOverrides): Promise<[string]>;
-
-    initialProposalId(overrides?: CallOverrides): Promise<[BigNumber]>;
-
-    initialize(
-      timelock_: PromiseOrValue<string>,
-      uni_: PromiseOrValue<string>,
-      votingPeriod_: PromiseOrValue<BigNumberish>,
-      votingDelay_: PromiseOrValue<BigNumberish>,
-      proposalThreshold_: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<ContractTransaction>;
-
-    latestProposalIds(
-      arg0: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<[BigNumber]>;
-
-    name(overrides?: CallOverrides): Promise<[string]>;
-
-    pendingAdmin(overrides?: CallOverrides): Promise<[string]>;
-
-    proposalCount(overrides?: CallOverrides): Promise<[BigNumber]>;
-
-    proposalMaxOperations(overrides?: CallOverrides): Promise<[BigNumber]>;
-
-    proposalThreshold(overrides?: CallOverrides): Promise<[BigNumber]>;
-
-    proposals(
-      arg0: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<
-      [
-        BigNumber,
-        string,
-        BigNumber,
-        BigNumber,
-        BigNumber,
-        BigNumber,
-        BigNumber,
-        BigNumber,
-        boolean,
-        boolean
-      ] & {
-        id: BigNumber;
-        proposer: string;
-        eta: BigNumber;
-        startBlock: BigNumber;
-        endBlock: BigNumber;
-        forVotes: BigNumber;
-        againstVotes: BigNumber;
-        abstainVotes: BigNumber;
-        canceled: boolean;
-        executed: boolean;
-      }
-    >;
-
-    propose(
-      targets: PromiseOrValue<string>[],
-      values: PromiseOrValue<BigNumberish>[],
-      signatures: PromiseOrValue<string>[],
-      calldatas: PromiseOrValue<BytesLike>[],
-      description: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<ContractTransaction>;
-
-    queue(
-      proposalId: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<ContractTransaction>;
-
-    quorumVotes(overrides?: CallOverrides): Promise<[BigNumber]>;
-
-    state(
-      proposalId: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<[number]>;
-
-    timelock(overrides?: CallOverrides): Promise<[string]>;
-
-    uni(overrides?: CallOverrides): Promise<[string]>;
-
-    votingDelay(overrides?: CallOverrides): Promise<[BigNumber]>;
-
-    votingPeriod(overrides?: CallOverrides): Promise<[BigNumber]>;
-  };
-
-  BALLOT_TYPEHASH(overrides?: CallOverrides): Promise<string>;
-
-  DOMAIN_TYPEHASH(overrides?: CallOverrides): Promise<string>;
-
-  MAX_PROPOSAL_THRESHOLD(overrides?: CallOverrides): Promise<BigNumber>;
-
-  MAX_VOTING_DELAY(overrides?: CallOverrides): Promise<BigNumber>;
-
-  MAX_VOTING_PERIOD(overrides?: CallOverrides): Promise<BigNumber>;
-
-  MIN_PROPOSAL_THRESHOLD(overrides?: CallOverrides): Promise<BigNumber>;
-
-  MIN_VOTING_DELAY(overrides?: CallOverrides): Promise<BigNumber>;
-
-  MIN_VOTING_PERIOD(overrides?: CallOverrides): Promise<BigNumber>;
-
-  _acceptAdmin(
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
-  ): Promise<ContractTransaction>;
-
-  _initiate(
-    proposalCount: PromiseOrValue<BigNumberish>,
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
-  ): Promise<ContractTransaction>;
-
-  _setPendingAdmin(
-    newPendingAdmin: PromiseOrValue<string>,
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
-  ): Promise<ContractTransaction>;
-
-  _setProposalThreshold(
-    newProposalThreshold: PromiseOrValue<BigNumberish>,
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
-  ): Promise<ContractTransaction>;
-
-  _setVotingDelay(
-    newVotingDelay: PromiseOrValue<BigNumberish>,
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
-  ): Promise<ContractTransaction>;
-
-  _setVotingPeriod(
-    newVotingPeriod: PromiseOrValue<BigNumberish>,
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
-  ): Promise<ContractTransaction>;
-
-  admin(overrides?: CallOverrides): Promise<string>;
-
-  cancel(
-    proposalId: PromiseOrValue<BigNumberish>,
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
-  ): Promise<ContractTransaction>;
-
-  castVote(
-    proposalId: PromiseOrValue<BigNumberish>,
-    support: PromiseOrValue<BigNumberish>,
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
-  ): Promise<ContractTransaction>;
-
-  castVoteBySig(
-    proposalId: PromiseOrValue<BigNumberish>,
-    support: PromiseOrValue<BigNumberish>,
-    v: PromiseOrValue<BigNumberish>,
-    r: PromiseOrValue<BytesLike>,
-    s: PromiseOrValue<BytesLike>,
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
-  ): Promise<ContractTransaction>;
-
-  castVoteWithReason(
-    proposalId: PromiseOrValue<BigNumberish>,
-    support: PromiseOrValue<BigNumberish>,
-    reason: PromiseOrValue<string>,
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
-  ): Promise<ContractTransaction>;
-
-  execute(
-    proposalId: PromiseOrValue<BigNumberish>,
-    overrides?: PayableOverrides & { from?: PromiseOrValue<string> }
-  ): Promise<ContractTransaction>;
-
-  getActions(
-    proposalId: PromiseOrValue<BigNumberish>,
-    overrides?: CallOverrides
-  ): Promise<
-    [string[], BigNumber[], string[], string[]] & {
-      targets: string[];
-      values: BigNumber[];
-      signatures: string[];
-      calldatas: string[];
-    }
-  >;
-
-  getReceipt(
-    proposalId: PromiseOrValue<BigNumberish>,
-    voter: PromiseOrValue<string>,
-    overrides?: CallOverrides
-  ): Promise<GovernorBravoDelegateStorageV1.ReceiptStructOutput>;
-
-  implementation(overrides?: CallOverrides): Promise<string>;
-
-  initialProposalId(overrides?: CallOverrides): Promise<BigNumber>;
-
-  initialize(
-    timelock_: PromiseOrValue<string>,
-    uni_: PromiseOrValue<string>,
-    votingPeriod_: PromiseOrValue<BigNumberish>,
-    votingDelay_: PromiseOrValue<BigNumberish>,
-    proposalThreshold_: PromiseOrValue<BigNumberish>,
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
-  ): Promise<ContractTransaction>;
-
-  latestProposalIds(
-    arg0: PromiseOrValue<string>,
-    overrides?: CallOverrides
-  ): Promise<BigNumber>;
-
-  name(overrides?: CallOverrides): Promise<string>;
-
-  pendingAdmin(overrides?: CallOverrides): Promise<string>;
-
-  proposalCount(overrides?: CallOverrides): Promise<BigNumber>;
-
-  proposalMaxOperations(overrides?: CallOverrides): Promise<BigNumber>;
-
-  proposalThreshold(overrides?: CallOverrides): Promise<BigNumber>;
-
-  proposals(
-    arg0: PromiseOrValue<BigNumberish>,
-    overrides?: CallOverrides
-  ): Promise<
-    [
-      BigNumber,
-      string,
-      BigNumber,
-      BigNumber,
-      BigNumber,
-      BigNumber,
-      BigNumber,
-      BigNumber,
-      boolean,
-      boolean
-    ] & {
-      id: BigNumber;
-      proposer: string;
-      eta: BigNumber;
-      startBlock: BigNumber;
-      endBlock: BigNumber;
-      forVotes: BigNumber;
-      againstVotes: BigNumber;
-      abstainVotes: BigNumber;
-      canceled: boolean;
-      executed: boolean;
-    }
-  >;
-
-  propose(
-    targets: PromiseOrValue<string>[],
-    values: PromiseOrValue<BigNumberish>[],
-    signatures: PromiseOrValue<string>[],
-    calldatas: PromiseOrValue<BytesLike>[],
-    description: PromiseOrValue<string>,
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
-  ): Promise<ContractTransaction>;
-
-  queue(
-    proposalId: PromiseOrValue<BigNumberish>,
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
-  ): Promise<ContractTransaction>;
-
-  quorumVotes(overrides?: CallOverrides): Promise<BigNumber>;
-
-  state(
-    proposalId: PromiseOrValue<BigNumberish>,
-    overrides?: CallOverrides
-  ): Promise<number>;
-
-  timelock(overrides?: CallOverrides): Promise<string>;
-
-  uni(overrides?: CallOverrides): Promise<string>;
-
-  votingDelay(overrides?: CallOverrides): Promise<BigNumber>;
-
-  votingPeriod(overrides?: CallOverrides): Promise<BigNumber>;
-
-  callStatic: {
-    BALLOT_TYPEHASH(overrides?: CallOverrides): Promise<string>;
-
-    DOMAIN_TYPEHASH(overrides?: CallOverrides): Promise<string>;
-
-    MAX_PROPOSAL_THRESHOLD(overrides?: CallOverrides): Promise<BigNumber>;
-
-    MAX_VOTING_DELAY(overrides?: CallOverrides): Promise<BigNumber>;
-
-    MAX_VOTING_PERIOD(overrides?: CallOverrides): Promise<BigNumber>;
-
-    MIN_PROPOSAL_THRESHOLD(overrides?: CallOverrides): Promise<BigNumber>;
-
-    MIN_VOTING_DELAY(overrides?: CallOverrides): Promise<BigNumber>;
-
-    MIN_VOTING_PERIOD(overrides?: CallOverrides): Promise<BigNumber>;
-
-    _acceptAdmin(overrides?: CallOverrides): Promise<void>;
-
-    _initiate(
-      proposalCount: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    _setPendingAdmin(
-      newPendingAdmin: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    _setProposalThreshold(
-      newProposalThreshold: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    _setVotingDelay(
-      newVotingDelay: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    _setVotingPeriod(
-      newVotingPeriod: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    admin(overrides?: CallOverrides): Promise<string>;
-
-    cancel(
-      proposalId: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    castVote(
-      proposalId: PromiseOrValue<BigNumberish>,
-      support: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    castVoteBySig(
-      proposalId: PromiseOrValue<BigNumberish>,
-      support: PromiseOrValue<BigNumberish>,
-      v: PromiseOrValue<BigNumberish>,
-      r: PromiseOrValue<BytesLike>,
-      s: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    castVoteWithReason(
-      proposalId: PromiseOrValue<BigNumberish>,
-      support: PromiseOrValue<BigNumberish>,
-      reason: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    execute(
-      proposalId: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    getActions(
-      proposalId: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<
-      [string[], BigNumber[], string[], string[]] & {
-        targets: string[];
-        values: BigNumber[];
-        signatures: string[];
-        calldatas: string[];
-      }
-    >;
-
-    getReceipt(
-      proposalId: PromiseOrValue<BigNumberish>,
-      voter: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<GovernorBravoDelegateStorageV1.ReceiptStructOutput>;
-
-    implementation(overrides?: CallOverrides): Promise<string>;
-
-    initialProposalId(overrides?: CallOverrides): Promise<BigNumber>;
-
-    initialize(
-      timelock_: PromiseOrValue<string>,
-      uni_: PromiseOrValue<string>,
-      votingPeriod_: PromiseOrValue<BigNumberish>,
-      votingDelay_: PromiseOrValue<BigNumberish>,
-      proposalThreshold_: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    latestProposalIds(
-      arg0: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    name(overrides?: CallOverrides): Promise<string>;
-
-    pendingAdmin(overrides?: CallOverrides): Promise<string>;
-
-    proposalCount(overrides?: CallOverrides): Promise<BigNumber>;
-
-    proposalMaxOperations(overrides?: CallOverrides): Promise<BigNumber>;
-
-    proposalThreshold(overrides?: CallOverrides): Promise<BigNumber>;
-
-    proposals(
-      arg0: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<
-      [
-        BigNumber,
-        string,
-        BigNumber,
-        BigNumber,
-        BigNumber,
-        BigNumber,
-        BigNumber,
-        BigNumber,
-        boolean,
-        boolean
-      ] & {
-        id: BigNumber;
-        proposer: string;
-        eta: BigNumber;
-        startBlock: BigNumber;
-        endBlock: BigNumber;
-        forVotes: BigNumber;
-        againstVotes: BigNumber;
-        abstainVotes: BigNumber;
-        canceled: boolean;
-        executed: boolean;
-      }
-    >;
-
-    propose(
-      targets: PromiseOrValue<string>[],
-      values: PromiseOrValue<BigNumberish>[],
-      signatures: PromiseOrValue<string>[],
-      calldatas: PromiseOrValue<BytesLike>[],
-      description: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    queue(
-      proposalId: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    quorumVotes(overrides?: CallOverrides): Promise<BigNumber>;
-
-    state(
-      proposalId: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<number>;
-
-    timelock(overrides?: CallOverrides): Promise<string>;
-
-    uni(overrides?: CallOverrides): Promise<string>;
-
-    votingDelay(overrides?: CallOverrides): Promise<BigNumber>;
-
-    votingPeriod(overrides?: CallOverrides): Promise<BigNumber>;
-  };
-
-  filters: {
-    "NewAdmin(address,address)"(
-      oldAdmin?: null,
-      newAdmin?: null
-    ): NewAdminEventFilter;
-    NewAdmin(oldAdmin?: null, newAdmin?: null): NewAdminEventFilter;
-
-    "NewImplementation(address,address)"(
-      oldImplementation?: null,
-      newImplementation?: null
-    ): NewImplementationEventFilter;
-    NewImplementation(
-      oldImplementation?: null,
-      newImplementation?: null
-    ): NewImplementationEventFilter;
-
-    "NewPendingAdmin(address,address)"(
-      oldPendingAdmin?: null,
-      newPendingAdmin?: null
-    ): NewPendingAdminEventFilter;
-    NewPendingAdmin(
-      oldPendingAdmin?: null,
-      newPendingAdmin?: null
-    ): NewPendingAdminEventFilter;
-
-    "ProposalCanceled(uint256)"(id?: null): ProposalCanceledEventFilter;
-    ProposalCanceled(id?: null): ProposalCanceledEventFilter;
-
-    "ProposalCreated(uint256,address,address[],uint256[],string[],bytes[],uint256,uint256,string)"(
-      id?: null,
-      proposer?: null,
-      targets?: null,
-      values?: null,
-      signatures?: null,
-      calldatas?: null,
-      startBlock?: null,
-      endBlock?: null,
-      description?: null
-    ): ProposalCreatedEventFilter;
-    ProposalCreated(
-      id?: null,
-      proposer?: null,
-      targets?: null,
-      values?: null,
-      signatures?: null,
-      calldatas?: null,
-      startBlock?: null,
-      endBlock?: null,
-      description?: null
-    ): ProposalCreatedEventFilter;
-
-    "ProposalExecuted(uint256)"(id?: null): ProposalExecutedEventFilter;
-    ProposalExecuted(id?: null): ProposalExecutedEventFilter;
-
-    "ProposalQueued(uint256,uint256)"(
-      id?: null,
-      eta?: null
-    ): ProposalQueuedEventFilter;
-    ProposalQueued(id?: null, eta?: null): ProposalQueuedEventFilter;
-
-    "ProposalThresholdSet(uint256,uint256)"(
-      oldProposalThreshold?: null,
-      newProposalThreshold?: null
-    ): ProposalThresholdSetEventFilter;
-    ProposalThresholdSet(
-      oldProposalThreshold?: null,
-      newProposalThreshold?: null
-    ): ProposalThresholdSetEventFilter;
-
-    "VoteCast(address,uint256,uint8,uint256,string)"(
-      voter?: PromiseOrValue<string> | null,
-      proposalId?: null,
-      support?: null,
-      votes?: null,
-      reason?: null
-    ): VoteCastEventFilter;
-    VoteCast(
-      voter?: PromiseOrValue<string> | null,
-      proposalId?: null,
-      support?: null,
-      votes?: null,
-      reason?: null
-    ): VoteCastEventFilter;
-
-    "VotingDelaySet(uint256,uint256)"(
-      oldVotingDelay?: null,
-      newVotingDelay?: null
-    ): VotingDelaySetEventFilter;
-    VotingDelaySet(
-      oldVotingDelay?: null,
-      newVotingDelay?: null
-    ): VotingDelaySetEventFilter;
-
-    "VotingPeriodSet(uint256,uint256)"(
-      oldVotingPeriod?: null,
-      newVotingPeriod?: null
-    ): VotingPeriodSetEventFilter;
-    VotingPeriodSet(
-      oldVotingPeriod?: null,
-      newVotingPeriod?: null
-    ): VotingPeriodSetEventFilter;
-  };
-
-  estimateGas: {
-    BALLOT_TYPEHASH(overrides?: CallOverrides): Promise<BigNumber>;
-
-    DOMAIN_TYPEHASH(overrides?: CallOverrides): Promise<BigNumber>;
-
-    MAX_PROPOSAL_THRESHOLD(overrides?: CallOverrides): Promise<BigNumber>;
-
-    MAX_VOTING_DELAY(overrides?: CallOverrides): Promise<BigNumber>;
-
-    MAX_VOTING_PERIOD(overrides?: CallOverrides): Promise<BigNumber>;
-
-    MIN_PROPOSAL_THRESHOLD(overrides?: CallOverrides): Promise<BigNumber>;
-
-    MIN_VOTING_DELAY(overrides?: CallOverrides): Promise<BigNumber>;
-
-    MIN_VOTING_PERIOD(overrides?: CallOverrides): Promise<BigNumber>;
-
-    _acceptAdmin(
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<BigNumber>;
-
-    _initiate(
-      proposalCount: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<BigNumber>;
-
-    _setPendingAdmin(
-      newPendingAdmin: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<BigNumber>;
-
-    _setProposalThreshold(
-      newProposalThreshold: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<BigNumber>;
-
-    _setVotingDelay(
-      newVotingDelay: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<BigNumber>;
-
-    _setVotingPeriod(
-      newVotingPeriod: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<BigNumber>;
-
-    admin(overrides?: CallOverrides): Promise<BigNumber>;
-
-    cancel(
-      proposalId: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<BigNumber>;
-
-    castVote(
-      proposalId: PromiseOrValue<BigNumberish>,
-      support: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<BigNumber>;
-
-    castVoteBySig(
-      proposalId: PromiseOrValue<BigNumberish>,
-      support: PromiseOrValue<BigNumberish>,
-      v: PromiseOrValue<BigNumberish>,
-      r: PromiseOrValue<BytesLike>,
-      s: PromiseOrValue<BytesLike>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<BigNumber>;
-
-    castVoteWithReason(
-      proposalId: PromiseOrValue<BigNumberish>,
-      support: PromiseOrValue<BigNumberish>,
-      reason: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<BigNumber>;
-
-    execute(
-      proposalId: PromiseOrValue<BigNumberish>,
-      overrides?: PayableOverrides & { from?: PromiseOrValue<string> }
-    ): Promise<BigNumber>;
-
-    getActions(
-      proposalId: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    getReceipt(
-      proposalId: PromiseOrValue<BigNumberish>,
-      voter: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    implementation(overrides?: CallOverrides): Promise<BigNumber>;
-
-    initialProposalId(overrides?: CallOverrides): Promise<BigNumber>;
-
-    initialize(
-      timelock_: PromiseOrValue<string>,
-      uni_: PromiseOrValue<string>,
-      votingPeriod_: PromiseOrValue<BigNumberish>,
-      votingDelay_: PromiseOrValue<BigNumberish>,
-      proposalThreshold_: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<BigNumber>;
-
-    latestProposalIds(
-      arg0: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    name(overrides?: CallOverrides): Promise<BigNumber>;
-
-    pendingAdmin(overrides?: CallOverrides): Promise<BigNumber>;
-
-    proposalCount(overrides?: CallOverrides): Promise<BigNumber>;
-
-    proposalMaxOperations(overrides?: CallOverrides): Promise<BigNumber>;
-
-    proposalThreshold(overrides?: CallOverrides): Promise<BigNumber>;
-
-    proposals(
-      arg0: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    propose(
-      targets: PromiseOrValue<string>[],
-      values: PromiseOrValue<BigNumberish>[],
-      signatures: PromiseOrValue<string>[],
-      calldatas: PromiseOrValue<BytesLike>[],
-      description: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<BigNumber>;
-
-    queue(
-      proposalId: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<BigNumber>;
-
-    quorumVotes(overrides?: CallOverrides): Promise<BigNumber>;
-
-    state(
-      proposalId: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    timelock(overrides?: CallOverrides): Promise<BigNumber>;
-
-    uni(overrides?: CallOverrides): Promise<BigNumber>;
-
-    votingDelay(overrides?: CallOverrides): Promise<BigNumber>;
-
-    votingPeriod(overrides?: CallOverrides): Promise<BigNumber>;
-  };
-
-  populateTransaction: {
-    BALLOT_TYPEHASH(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    DOMAIN_TYPEHASH(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    MAX_PROPOSAL_THRESHOLD(
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    MAX_VOTING_DELAY(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    MAX_VOTING_PERIOD(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    MIN_PROPOSAL_THRESHOLD(
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    MIN_VOTING_DELAY(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    MIN_VOTING_PERIOD(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    _acceptAdmin(
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<PopulatedTransaction>;
-
-    _initiate(
-      proposalCount: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<PopulatedTransaction>;
-
-    _setPendingAdmin(
-      newPendingAdmin: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<PopulatedTransaction>;
-
-    _setProposalThreshold(
-      newProposalThreshold: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<PopulatedTransaction>;
-
-    _setVotingDelay(
-      newVotingDelay: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<PopulatedTransaction>;
-
-    _setVotingPeriod(
-      newVotingPeriod: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<PopulatedTransaction>;
-
-    admin(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    cancel(
-      proposalId: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<PopulatedTransaction>;
-
-    castVote(
-      proposalId: PromiseOrValue<BigNumberish>,
-      support: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<PopulatedTransaction>;
-
-    castVoteBySig(
-      proposalId: PromiseOrValue<BigNumberish>,
-      support: PromiseOrValue<BigNumberish>,
-      v: PromiseOrValue<BigNumberish>,
-      r: PromiseOrValue<BytesLike>,
-      s: PromiseOrValue<BytesLike>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<PopulatedTransaction>;
-
-    castVoteWithReason(
-      proposalId: PromiseOrValue<BigNumberish>,
-      support: PromiseOrValue<BigNumberish>,
-      reason: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<PopulatedTransaction>;
-
-    execute(
-      proposalId: PromiseOrValue<BigNumberish>,
-      overrides?: PayableOverrides & { from?: PromiseOrValue<string> }
-    ): Promise<PopulatedTransaction>;
-
-    getActions(
-      proposalId: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    getReceipt(
-      proposalId: PromiseOrValue<BigNumberish>,
-      voter: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    implementation(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    initialProposalId(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    initialize(
-      timelock_: PromiseOrValue<string>,
-      uni_: PromiseOrValue<string>,
-      votingPeriod_: PromiseOrValue<BigNumberish>,
-      votingDelay_: PromiseOrValue<BigNumberish>,
-      proposalThreshold_: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<PopulatedTransaction>;
-
-    latestProposalIds(
-      arg0: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    name(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    pendingAdmin(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    proposalCount(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    proposalMaxOperations(
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    proposalThreshold(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    proposals(
-      arg0: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    propose(
-      targets: PromiseOrValue<string>[],
-      values: PromiseOrValue<BigNumberish>[],
-      signatures: PromiseOrValue<string>[],
-      calldatas: PromiseOrValue<BytesLike>[],
-      description: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<PopulatedTransaction>;
-
-    queue(
-      proposalId: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<PopulatedTransaction>;
-
-    quorumVotes(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    state(
-      proposalId: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    timelock(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    uni(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    votingDelay(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    votingPeriod(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-  };
-}
diff --git a/src/legacy/abis/types/Multicall.d.ts b/src/legacy/abis/types/Multicall.d.ts
deleted file mode 100644
index 1ab76d6fe8..0000000000
--- a/src/legacy/abis/types/Multicall.d.ts
+++ /dev/null
@@ -1,482 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-
-import {
-  ethers,
-  EventFilter,
-  Signer,
-  BigNumber,
-  BigNumberish,
-  PopulatedTransaction,
-  BaseContract,
-  ContractTransaction,
-  Overrides,
-  CallOverrides,
-} from "ethers";
-import { BytesLike } from "@ethersproject/bytes";
-import { Listener, Provider } from "@ethersproject/providers";
-import { FunctionFragment, EventFragment, Result } from "@ethersproject/abi";
-import type { TypedEventFilter, TypedEvent, TypedListener } from "./common";
-
-interface MulticallInterface extends ethers.utils.Interface {
-  functions: {
-    "aggregate(tuple[])": FunctionFragment;
-    "blockAndAggregate(tuple[])": FunctionFragment;
-    "getBlockHash(uint256)": FunctionFragment;
-    "getBlockNumber()": FunctionFragment;
-    "getCurrentBlockCoinbase()": FunctionFragment;
-    "getCurrentBlockDifficulty()": FunctionFragment;
-    "getCurrentBlockGasLimit()": FunctionFragment;
-    "getCurrentBlockTimestamp()": FunctionFragment;
-    "getEthBalance(address)": FunctionFragment;
-    "getLastBlockHash()": FunctionFragment;
-    "tryAggregate(bool,tuple[])": FunctionFragment;
-    "tryBlockAndAggregate(bool,tuple[])": FunctionFragment;
-  };
-
-  encodeFunctionData(
-    functionFragment: "aggregate",
-    values: [{ target: string; callData: BytesLike }[]]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "blockAndAggregate",
-    values: [{ target: string; callData: BytesLike }[]]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "getBlockHash",
-    values: [BigNumberish]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "getBlockNumber",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "getCurrentBlockCoinbase",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "getCurrentBlockDifficulty",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "getCurrentBlockGasLimit",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "getCurrentBlockTimestamp",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "getEthBalance",
-    values: [string]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "getLastBlockHash",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "tryAggregate",
-    values: [boolean, { target: string; callData: BytesLike }[]]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "tryBlockAndAggregate",
-    values: [boolean, { target: string; callData: BytesLike }[]]
-  ): string;
-
-  decodeFunctionResult(functionFragment: "aggregate", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "blockAndAggregate",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "getBlockHash",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "getBlockNumber",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "getCurrentBlockCoinbase",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "getCurrentBlockDifficulty",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "getCurrentBlockGasLimit",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "getCurrentBlockTimestamp",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "getEthBalance",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "getLastBlockHash",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "tryAggregate",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "tryBlockAndAggregate",
-    data: BytesLike
-  ): Result;
-
-  events: {};
-}
-
-export class Multicall extends BaseContract {
-  connect(signerOrProvider: Signer | Provider | string): this;
-  attach(addressOrName: string): this;
-  deployed(): Promise<this>;
-
-  listeners<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter?: TypedEventFilter<EventArgsArray, EventArgsObject>
-  ): Array<TypedListener<EventArgsArray, EventArgsObject>>;
-  off<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    listener: TypedListener<EventArgsArray, EventArgsObject>
-  ): this;
-  on<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    listener: TypedListener<EventArgsArray, EventArgsObject>
-  ): this;
-  once<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    listener: TypedListener<EventArgsArray, EventArgsObject>
-  ): this;
-  removeListener<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    listener: TypedListener<EventArgsArray, EventArgsObject>
-  ): this;
-  removeAllListeners<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>
-  ): this;
-
-  listeners(eventName?: string): Array<Listener>;
-  off(eventName: string, listener: Listener): this;
-  on(eventName: string, listener: Listener): this;
-  once(eventName: string, listener: Listener): this;
-  removeListener(eventName: string, listener: Listener): this;
-  removeAllListeners(eventName?: string): this;
-
-  queryFilter<EventArgsArray extends Array<any>, EventArgsObject>(
-    event: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    fromBlockOrBlockhash?: string | number | undefined,
-    toBlock?: string | number | undefined
-  ): Promise<Array<TypedEvent<EventArgsArray & EventArgsObject>>>;
-
-  interface: MulticallInterface;
-
-  functions: {
-    aggregate(
-      calls: { target: string; callData: BytesLike }[],
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    blockAndAggregate(
-      calls: { target: string; callData: BytesLike }[],
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    getBlockHash(
-      blockNumber: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<
-      [
-        string,
-        ([boolean, string] & { success: boolean; returnData: string })[]
-      ] & {
-        blockHash: string;
-        returnData: ([boolean, string] & {
-          success: boolean;
-          returnData: string;
-        })[];
-      }
-    >;
-
-    getBlockNumber(
-      overrides?: CallOverrides
-    ): Promise<[BigNumber] & { blockNumber: BigNumber }>;
-
-    getCurrentBlockCoinbase(
-      overrides?: CallOverrides
-    ): Promise<[string] & { coinbase: string }>;
-
-    getCurrentBlockDifficulty(
-      overrides?: CallOverrides
-    ): Promise<[BigNumber] & { difficulty: BigNumber }>;
-
-    getCurrentBlockGasLimit(
-      overrides?: CallOverrides
-    ): Promise<[BigNumber] & { gaslimit: BigNumber }>;
-
-    getCurrentBlockTimestamp(
-      overrides?: CallOverrides
-    ): Promise<[BigNumber] & { timestamp: BigNumber }>;
-
-    getEthBalance(
-      addr: string,
-      overrides?: CallOverrides
-    ): Promise<[BigNumber] & { balance: BigNumber }>;
-
-    getLastBlockHash(
-      overrides?: CallOverrides
-    ): Promise<[string] & { blockHash: string }>;
-
-    tryAggregate(
-      requireSuccess: boolean,
-      calls: { target: string; callData: BytesLike }[],
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    tryBlockAndAggregate(
-      requireSuccess: boolean,
-      calls: { target: string; callData: BytesLike }[],
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-  };
-
-  aggregate(
-    calls: { target: string; callData: BytesLike }[],
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  blockAndAggregate(
-    calls: { target: string; callData: BytesLike }[],
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  getBlockHash(
-    blockNumber: BigNumberish,
-    overrides?: CallOverrides
-  ): Promise<
-    [
-      string,
-      ([boolean, string] & { success: boolean; returnData: string })[]
-    ] & {
-      blockHash: string;
-      returnData: ([boolean, string] & {
-        success: boolean;
-        returnData: string;
-      })[];
-    }
-  >;
-
-  getBlockNumber(overrides?: CallOverrides): Promise<BigNumber>;
-
-  getCurrentBlockCoinbase(overrides?: CallOverrides): Promise<string>;
-
-  getCurrentBlockDifficulty(overrides?: CallOverrides): Promise<BigNumber>;
-
-  getCurrentBlockGasLimit(overrides?: CallOverrides): Promise<BigNumber>;
-
-  getCurrentBlockTimestamp(overrides?: CallOverrides): Promise<BigNumber>;
-
-  getEthBalance(addr: string, overrides?: CallOverrides): Promise<BigNumber>;
-
-  getLastBlockHash(overrides?: CallOverrides): Promise<string>;
-
-  tryAggregate(
-    requireSuccess: boolean,
-    calls: { target: string; callData: BytesLike }[],
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  tryBlockAndAggregate(
-    requireSuccess: boolean,
-    calls: { target: string; callData: BytesLike }[],
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  callStatic: {
-    aggregate(
-      calls: { target: string; callData: BytesLike }[],
-      overrides?: CallOverrides
-    ): Promise<
-      [BigNumber, string[]] & { blockNumber: BigNumber; returnData: string[] }
-    >;
-
-    blockAndAggregate(
-      calls: { target: string; callData: BytesLike }[],
-      overrides?: CallOverrides
-    ): Promise<
-      [
-        BigNumber,
-        string,
-        ([boolean, string] & { success: boolean; returnData: string })[]
-      ] & {
-        blockNumber: BigNumber;
-        blockHash: string;
-        returnData: ([boolean, string] & {
-          success: boolean;
-          returnData: string;
-        })[];
-      }
-    >;
-
-    getBlockHash(
-      blockNumber: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<
-      [
-        string,
-        ([boolean, string] & { success: boolean; returnData: string })[]
-      ] & {
-        blockHash: string;
-        returnData: ([boolean, string] & {
-          success: boolean;
-          returnData: string;
-        })[];
-      }
-    >;
-
-    getBlockNumber(overrides?: CallOverrides): Promise<BigNumber>;
-
-    getCurrentBlockCoinbase(overrides?: CallOverrides): Promise<string>;
-
-    getCurrentBlockDifficulty(overrides?: CallOverrides): Promise<BigNumber>;
-
-    getCurrentBlockGasLimit(overrides?: CallOverrides): Promise<BigNumber>;
-
-    getCurrentBlockTimestamp(overrides?: CallOverrides): Promise<BigNumber>;
-
-    getEthBalance(addr: string, overrides?: CallOverrides): Promise<BigNumber>;
-
-    getLastBlockHash(overrides?: CallOverrides): Promise<string>;
-
-    tryAggregate(
-      requireSuccess: boolean,
-      calls: { target: string; callData: BytesLike }[],
-      overrides?: CallOverrides
-    ): Promise<
-      ([boolean, string] & { success: boolean; returnData: string })[]
-    >;
-
-    tryBlockAndAggregate(
-      requireSuccess: boolean,
-      calls: { target: string; callData: BytesLike }[],
-      overrides?: CallOverrides
-    ): Promise<
-      [
-        BigNumber,
-        string,
-        ([boolean, string] & { success: boolean; returnData: string })[]
-      ] & {
-        blockNumber: BigNumber;
-        blockHash: string;
-        returnData: ([boolean, string] & {
-          success: boolean;
-          returnData: string;
-        })[];
-      }
-    >;
-  };
-
-  filters: {};
-
-  estimateGas: {
-    aggregate(
-      calls: { target: string; callData: BytesLike }[],
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    blockAndAggregate(
-      calls: { target: string; callData: BytesLike }[],
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    getBlockHash(
-      blockNumber: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    getBlockNumber(overrides?: CallOverrides): Promise<BigNumber>;
-
-    getCurrentBlockCoinbase(overrides?: CallOverrides): Promise<BigNumber>;
-
-    getCurrentBlockDifficulty(overrides?: CallOverrides): Promise<BigNumber>;
-
-    getCurrentBlockGasLimit(overrides?: CallOverrides): Promise<BigNumber>;
-
-    getCurrentBlockTimestamp(overrides?: CallOverrides): Promise<BigNumber>;
-
-    getEthBalance(addr: string, overrides?: CallOverrides): Promise<BigNumber>;
-
-    getLastBlockHash(overrides?: CallOverrides): Promise<BigNumber>;
-
-    tryAggregate(
-      requireSuccess: boolean,
-      calls: { target: string; callData: BytesLike }[],
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    tryBlockAndAggregate(
-      requireSuccess: boolean,
-      calls: { target: string; callData: BytesLike }[],
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-  };
-
-  populateTransaction: {
-    aggregate(
-      calls: { target: string; callData: BytesLike }[],
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    blockAndAggregate(
-      calls: { target: string; callData: BytesLike }[],
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    getBlockHash(
-      blockNumber: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    getBlockNumber(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    getCurrentBlockCoinbase(
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    getCurrentBlockDifficulty(
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    getCurrentBlockGasLimit(
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    getCurrentBlockTimestamp(
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    getEthBalance(
-      addr: string,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    getLastBlockHash(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    tryAggregate(
-      requireSuccess: boolean,
-      calls: { target: string; callData: BytesLike }[],
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    tryBlockAndAggregate(
-      requireSuccess: boolean,
-      calls: { target: string; callData: BytesLike }[],
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-  };
-}
diff --git a/src/legacy/abis/types/Multicall.ts b/src/legacy/abis/types/Multicall.ts
deleted file mode 100644
index db0cd5aa93..0000000000
--- a/src/legacy/abis/types/Multicall.ts
+++ /dev/null
@@ -1,482 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-import type {
-  BaseContract,
-  BigNumber,
-  BigNumberish,
-  BytesLike,
-  CallOverrides,
-  ContractTransaction,
-  Overrides,
-  PopulatedTransaction,
-  Signer,
-  utils,
-} from "ethers";
-import type { FunctionFragment, Result } from "@ethersproject/abi";
-import type { Listener, Provider } from "@ethersproject/providers";
-import type {
-  TypedEventFilter,
-  TypedEvent,
-  TypedListener,
-  OnEvent,
-  PromiseOrValue,
-} from "./common";
-
-export declare namespace Multicall2 {
-  export type CallStruct = {
-    target: PromiseOrValue<string>;
-    callData: PromiseOrValue<BytesLike>;
-  };
-
-  export type CallStructOutput = [string, string] & {
-    target: string;
-    callData: string;
-  };
-
-  export type ResultStruct = {
-    success: PromiseOrValue<boolean>;
-    returnData: PromiseOrValue<BytesLike>;
-  };
-
-  export type ResultStructOutput = [boolean, string] & {
-    success: boolean;
-    returnData: string;
-  };
-}
-
-export interface MulticallInterface extends utils.Interface {
-  functions: {
-    "aggregate((address,bytes)[])": FunctionFragment;
-    "blockAndAggregate((address,bytes)[])": FunctionFragment;
-    "getBlockHash(uint256)": FunctionFragment;
-    "getBlockNumber()": FunctionFragment;
-    "getCurrentBlockCoinbase()": FunctionFragment;
-    "getCurrentBlockDifficulty()": FunctionFragment;
-    "getCurrentBlockGasLimit()": FunctionFragment;
-    "getCurrentBlockTimestamp()": FunctionFragment;
-    "getEthBalance(address)": FunctionFragment;
-    "getLastBlockHash()": FunctionFragment;
-    "tryAggregate(bool,(address,bytes)[])": FunctionFragment;
-    "tryBlockAndAggregate(bool,(address,bytes)[])": FunctionFragment;
-  };
-
-  getFunction(
-    nameOrSignatureOrTopic:
-      | "aggregate"
-      | "blockAndAggregate"
-      | "getBlockHash"
-      | "getBlockNumber"
-      | "getCurrentBlockCoinbase"
-      | "getCurrentBlockDifficulty"
-      | "getCurrentBlockGasLimit"
-      | "getCurrentBlockTimestamp"
-      | "getEthBalance"
-      | "getLastBlockHash"
-      | "tryAggregate"
-      | "tryBlockAndAggregate"
-  ): FunctionFragment;
-
-  encodeFunctionData(
-    functionFragment: "aggregate",
-    values: [Multicall2.CallStruct[]]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "blockAndAggregate",
-    values: [Multicall2.CallStruct[]]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "getBlockHash",
-    values: [PromiseOrValue<BigNumberish>]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "getBlockNumber",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "getCurrentBlockCoinbase",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "getCurrentBlockDifficulty",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "getCurrentBlockGasLimit",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "getCurrentBlockTimestamp",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "getEthBalance",
-    values: [PromiseOrValue<string>]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "getLastBlockHash",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "tryAggregate",
-    values: [PromiseOrValue<boolean>, Multicall2.CallStruct[]]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "tryBlockAndAggregate",
-    values: [PromiseOrValue<boolean>, Multicall2.CallStruct[]]
-  ): string;
-
-  decodeFunctionResult(functionFragment: "aggregate", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "blockAndAggregate",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "getBlockHash",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "getBlockNumber",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "getCurrentBlockCoinbase",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "getCurrentBlockDifficulty",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "getCurrentBlockGasLimit",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "getCurrentBlockTimestamp",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "getEthBalance",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "getLastBlockHash",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "tryAggregate",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "tryBlockAndAggregate",
-    data: BytesLike
-  ): Result;
-
-  events: {};
-}
-
-export interface Multicall extends BaseContract {
-  connect(signerOrProvider: Signer | Provider | string): this;
-  attach(addressOrName: string): this;
-  deployed(): Promise<this>;
-
-  interface: MulticallInterface;
-
-  queryFilter<TEvent extends TypedEvent>(
-    event: TypedEventFilter<TEvent>,
-    fromBlockOrBlockhash?: string | number | undefined,
-    toBlock?: string | number | undefined
-  ): Promise<Array<TEvent>>;
-
-  listeners<TEvent extends TypedEvent>(
-    eventFilter?: TypedEventFilter<TEvent>
-  ): Array<TypedListener<TEvent>>;
-  listeners(eventName?: string): Array<Listener>;
-  removeAllListeners<TEvent extends TypedEvent>(
-    eventFilter: TypedEventFilter<TEvent>
-  ): this;
-  removeAllListeners(eventName?: string): this;
-  off: OnEvent<this>;
-  on: OnEvent<this>;
-  once: OnEvent<this>;
-  removeListener: OnEvent<this>;
-
-  functions: {
-    aggregate(
-      calls: Multicall2.CallStruct[],
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<ContractTransaction>;
-
-    blockAndAggregate(
-      calls: Multicall2.CallStruct[],
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<ContractTransaction>;
-
-    getBlockHash(
-      blockNumber: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<
-      [string, Multicall2.ResultStructOutput[]] & {
-        blockHash: string;
-        returnData: Multicall2.ResultStructOutput[];
-      }
-    >;
-
-    getBlockNumber(
-      overrides?: CallOverrides
-    ): Promise<[BigNumber] & { blockNumber: BigNumber }>;
-
-    getCurrentBlockCoinbase(
-      overrides?: CallOverrides
-    ): Promise<[string] & { coinbase: string }>;
-
-    getCurrentBlockDifficulty(
-      overrides?: CallOverrides
-    ): Promise<[BigNumber] & { difficulty: BigNumber }>;
-
-    getCurrentBlockGasLimit(
-      overrides?: CallOverrides
-    ): Promise<[BigNumber] & { gaslimit: BigNumber }>;
-
-    getCurrentBlockTimestamp(
-      overrides?: CallOverrides
-    ): Promise<[BigNumber] & { timestamp: BigNumber }>;
-
-    getEthBalance(
-      addr: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<[BigNumber] & { balance: BigNumber }>;
-
-    getLastBlockHash(
-      overrides?: CallOverrides
-    ): Promise<[string] & { blockHash: string }>;
-
-    tryAggregate(
-      requireSuccess: PromiseOrValue<boolean>,
-      calls: Multicall2.CallStruct[],
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<ContractTransaction>;
-
-    tryBlockAndAggregate(
-      requireSuccess: PromiseOrValue<boolean>,
-      calls: Multicall2.CallStruct[],
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<ContractTransaction>;
-  };
-
-  aggregate(
-    calls: Multicall2.CallStruct[],
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
-  ): Promise<ContractTransaction>;
-
-  blockAndAggregate(
-    calls: Multicall2.CallStruct[],
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
-  ): Promise<ContractTransaction>;
-
-  getBlockHash(
-    blockNumber: PromiseOrValue<BigNumberish>,
-    overrides?: CallOverrides
-  ): Promise<
-    [string, Multicall2.ResultStructOutput[]] & {
-      blockHash: string;
-      returnData: Multicall2.ResultStructOutput[];
-    }
-  >;
-
-  getBlockNumber(overrides?: CallOverrides): Promise<BigNumber>;
-
-  getCurrentBlockCoinbase(overrides?: CallOverrides): Promise<string>;
-
-  getCurrentBlockDifficulty(overrides?: CallOverrides): Promise<BigNumber>;
-
-  getCurrentBlockGasLimit(overrides?: CallOverrides): Promise<BigNumber>;
-
-  getCurrentBlockTimestamp(overrides?: CallOverrides): Promise<BigNumber>;
-
-  getEthBalance(
-    addr: PromiseOrValue<string>,
-    overrides?: CallOverrides
-  ): Promise<BigNumber>;
-
-  getLastBlockHash(overrides?: CallOverrides): Promise<string>;
-
-  tryAggregate(
-    requireSuccess: PromiseOrValue<boolean>,
-    calls: Multicall2.CallStruct[],
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
-  ): Promise<ContractTransaction>;
-
-  tryBlockAndAggregate(
-    requireSuccess: PromiseOrValue<boolean>,
-    calls: Multicall2.CallStruct[],
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
-  ): Promise<ContractTransaction>;
-
-  callStatic: {
-    aggregate(
-      calls: Multicall2.CallStruct[],
-      overrides?: CallOverrides
-    ): Promise<
-      [BigNumber, string[]] & { blockNumber: BigNumber; returnData: string[] }
-    >;
-
-    blockAndAggregate(
-      calls: Multicall2.CallStruct[],
-      overrides?: CallOverrides
-    ): Promise<
-      [BigNumber, string, Multicall2.ResultStructOutput[]] & {
-        blockNumber: BigNumber;
-        blockHash: string;
-        returnData: Multicall2.ResultStructOutput[];
-      }
-    >;
-
-    getBlockHash(
-      blockNumber: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<
-      [string, Multicall2.ResultStructOutput[]] & {
-        blockHash: string;
-        returnData: Multicall2.ResultStructOutput[];
-      }
-    >;
-
-    getBlockNumber(overrides?: CallOverrides): Promise<BigNumber>;
-
-    getCurrentBlockCoinbase(overrides?: CallOverrides): Promise<string>;
-
-    getCurrentBlockDifficulty(overrides?: CallOverrides): Promise<BigNumber>;
-
-    getCurrentBlockGasLimit(overrides?: CallOverrides): Promise<BigNumber>;
-
-    getCurrentBlockTimestamp(overrides?: CallOverrides): Promise<BigNumber>;
-
-    getEthBalance(
-      addr: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    getLastBlockHash(overrides?: CallOverrides): Promise<string>;
-
-    tryAggregate(
-      requireSuccess: PromiseOrValue<boolean>,
-      calls: Multicall2.CallStruct[],
-      overrides?: CallOverrides
-    ): Promise<Multicall2.ResultStructOutput[]>;
-
-    tryBlockAndAggregate(
-      requireSuccess: PromiseOrValue<boolean>,
-      calls: Multicall2.CallStruct[],
-      overrides?: CallOverrides
-    ): Promise<
-      [BigNumber, string, Multicall2.ResultStructOutput[]] & {
-        blockNumber: BigNumber;
-        blockHash: string;
-        returnData: Multicall2.ResultStructOutput[];
-      }
-    >;
-  };
-
-  filters: {};
-
-  estimateGas: {
-    aggregate(
-      calls: Multicall2.CallStruct[],
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<BigNumber>;
-
-    blockAndAggregate(
-      calls: Multicall2.CallStruct[],
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<BigNumber>;
-
-    getBlockHash(
-      blockNumber: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    getBlockNumber(overrides?: CallOverrides): Promise<BigNumber>;
-
-    getCurrentBlockCoinbase(overrides?: CallOverrides): Promise<BigNumber>;
-
-    getCurrentBlockDifficulty(overrides?: CallOverrides): Promise<BigNumber>;
-
-    getCurrentBlockGasLimit(overrides?: CallOverrides): Promise<BigNumber>;
-
-    getCurrentBlockTimestamp(overrides?: CallOverrides): Promise<BigNumber>;
-
-    getEthBalance(
-      addr: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    getLastBlockHash(overrides?: CallOverrides): Promise<BigNumber>;
-
-    tryAggregate(
-      requireSuccess: PromiseOrValue<boolean>,
-      calls: Multicall2.CallStruct[],
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<BigNumber>;
-
-    tryBlockAndAggregate(
-      requireSuccess: PromiseOrValue<boolean>,
-      calls: Multicall2.CallStruct[],
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<BigNumber>;
-  };
-
-  populateTransaction: {
-    aggregate(
-      calls: Multicall2.CallStruct[],
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<PopulatedTransaction>;
-
-    blockAndAggregate(
-      calls: Multicall2.CallStruct[],
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<PopulatedTransaction>;
-
-    getBlockHash(
-      blockNumber: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    getBlockNumber(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    getCurrentBlockCoinbase(
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    getCurrentBlockDifficulty(
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    getCurrentBlockGasLimit(
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    getCurrentBlockTimestamp(
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    getEthBalance(
-      addr: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    getLastBlockHash(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    tryAggregate(
-      requireSuccess: PromiseOrValue<boolean>,
-      calls: Multicall2.CallStruct[],
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<PopulatedTransaction>;
-
-    tryBlockAndAggregate(
-      requireSuccess: PromiseOrValue<boolean>,
-      calls: Multicall2.CallStruct[],
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<PopulatedTransaction>;
-  };
-}
diff --git a/src/legacy/abis/types/Multicall2.d.ts b/src/legacy/abis/types/Multicall2.d.ts
deleted file mode 100644
index 78eeacac93..0000000000
--- a/src/legacy/abis/types/Multicall2.d.ts
+++ /dev/null
@@ -1,449 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-
-import {
-  ethers,
-  EventFilter,
-  Signer,
-  BigNumber,
-  BigNumberish,
-  PopulatedTransaction,
-  BaseContract,
-  ContractTransaction,
-  Overrides,
-  CallOverrides,
-} from "ethers";
-import { BytesLike } from "@ethersproject/bytes";
-import { Listener, Provider } from "@ethersproject/providers";
-import { FunctionFragment, EventFragment, Result } from "@ethersproject/abi";
-import type { TypedEventFilter, TypedEvent, TypedListener } from "./common";
-
-interface Multicall2Interface extends ethers.utils.Interface {
-  functions: {
-    "aggregate(tuple[])": FunctionFragment;
-    "blockAndAggregate(tuple[])": FunctionFragment;
-    "getBlockHash(uint256)": FunctionFragment;
-    "getBlockNumber()": FunctionFragment;
-    "getCurrentBlockCoinbase()": FunctionFragment;
-    "getCurrentBlockDifficulty()": FunctionFragment;
-    "getCurrentBlockGasLimit()": FunctionFragment;
-    "getCurrentBlockTimestamp()": FunctionFragment;
-    "getEthBalance(address)": FunctionFragment;
-    "getLastBlockHash()": FunctionFragment;
-    "tryAggregate(bool,tuple[])": FunctionFragment;
-    "tryBlockAndAggregate(bool,tuple[])": FunctionFragment;
-  };
-
-  encodeFunctionData(
-    functionFragment: "aggregate",
-    values: [{ target: string; callData: BytesLike }[]]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "blockAndAggregate",
-    values: [{ target: string; callData: BytesLike }[]]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "getBlockHash",
-    values: [BigNumberish]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "getBlockNumber",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "getCurrentBlockCoinbase",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "getCurrentBlockDifficulty",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "getCurrentBlockGasLimit",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "getCurrentBlockTimestamp",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "getEthBalance",
-    values: [string]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "getLastBlockHash",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "tryAggregate",
-    values: [boolean, { target: string; callData: BytesLike }[]]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "tryBlockAndAggregate",
-    values: [boolean, { target: string; callData: BytesLike }[]]
-  ): string;
-
-  decodeFunctionResult(functionFragment: "aggregate", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "blockAndAggregate",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "getBlockHash",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "getBlockNumber",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "getCurrentBlockCoinbase",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "getCurrentBlockDifficulty",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "getCurrentBlockGasLimit",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "getCurrentBlockTimestamp",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "getEthBalance",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "getLastBlockHash",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "tryAggregate",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "tryBlockAndAggregate",
-    data: BytesLike
-  ): Result;
-
-  events: {};
-}
-
-export class Multicall2 extends BaseContract {
-  connect(signerOrProvider: Signer | Provider | string): this;
-  attach(addressOrName: string): this;
-  deployed(): Promise<this>;
-
-  listeners<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter?: TypedEventFilter<EventArgsArray, EventArgsObject>
-  ): Array<TypedListener<EventArgsArray, EventArgsObject>>;
-  off<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    listener: TypedListener<EventArgsArray, EventArgsObject>
-  ): this;
-  on<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    listener: TypedListener<EventArgsArray, EventArgsObject>
-  ): this;
-  once<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    listener: TypedListener<EventArgsArray, EventArgsObject>
-  ): this;
-  removeListener<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    listener: TypedListener<EventArgsArray, EventArgsObject>
-  ): this;
-  removeAllListeners<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>
-  ): this;
-
-  listeners(eventName?: string): Array<Listener>;
-  off(eventName: string, listener: Listener): this;
-  on(eventName: string, listener: Listener): this;
-  once(eventName: string, listener: Listener): this;
-  removeListener(eventName: string, listener: Listener): this;
-  removeAllListeners(eventName?: string): this;
-
-  queryFilter<EventArgsArray extends Array<any>, EventArgsObject>(
-    event: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    fromBlockOrBlockhash?: string | number | undefined,
-    toBlock?: string | number | undefined
-  ): Promise<Array<TypedEvent<EventArgsArray & EventArgsObject>>>;
-
-  interface: Multicall2Interface;
-
-  functions: {
-    aggregate(
-      calls: { target: string; callData: BytesLike }[],
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    blockAndAggregate(
-      calls: { target: string; callData: BytesLike }[],
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    getBlockHash(
-      blockNumber: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<[string] & { blockHash: string }>;
-
-    getBlockNumber(
-      overrides?: CallOverrides
-    ): Promise<[BigNumber] & { blockNumber: BigNumber }>;
-
-    getCurrentBlockCoinbase(
-      overrides?: CallOverrides
-    ): Promise<[string] & { coinbase: string }>;
-
-    getCurrentBlockDifficulty(
-      overrides?: CallOverrides
-    ): Promise<[BigNumber] & { difficulty: BigNumber }>;
-
-    getCurrentBlockGasLimit(
-      overrides?: CallOverrides
-    ): Promise<[BigNumber] & { gaslimit: BigNumber }>;
-
-    getCurrentBlockTimestamp(
-      overrides?: CallOverrides
-    ): Promise<[BigNumber] & { timestamp: BigNumber }>;
-
-    getEthBalance(
-      addr: string,
-      overrides?: CallOverrides
-    ): Promise<[BigNumber] & { balance: BigNumber }>;
-
-    getLastBlockHash(
-      overrides?: CallOverrides
-    ): Promise<[string] & { blockHash: string }>;
-
-    tryAggregate(
-      requireSuccess: boolean,
-      calls: { target: string; callData: BytesLike }[],
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    tryBlockAndAggregate(
-      requireSuccess: boolean,
-      calls: { target: string; callData: BytesLike }[],
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-  };
-
-  aggregate(
-    calls: { target: string; callData: BytesLike }[],
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  blockAndAggregate(
-    calls: { target: string; callData: BytesLike }[],
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  getBlockHash(
-    blockNumber: BigNumberish,
-    overrides?: CallOverrides
-  ): Promise<string>;
-
-  getBlockNumber(overrides?: CallOverrides): Promise<BigNumber>;
-
-  getCurrentBlockCoinbase(overrides?: CallOverrides): Promise<string>;
-
-  getCurrentBlockDifficulty(overrides?: CallOverrides): Promise<BigNumber>;
-
-  getCurrentBlockGasLimit(overrides?: CallOverrides): Promise<BigNumber>;
-
-  getCurrentBlockTimestamp(overrides?: CallOverrides): Promise<BigNumber>;
-
-  getEthBalance(addr: string, overrides?: CallOverrides): Promise<BigNumber>;
-
-  getLastBlockHash(overrides?: CallOverrides): Promise<string>;
-
-  tryAggregate(
-    requireSuccess: boolean,
-    calls: { target: string; callData: BytesLike }[],
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  tryBlockAndAggregate(
-    requireSuccess: boolean,
-    calls: { target: string; callData: BytesLike }[],
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  callStatic: {
-    aggregate(
-      calls: { target: string; callData: BytesLike }[],
-      overrides?: CallOverrides
-    ): Promise<
-      [BigNumber, string[]] & { blockNumber: BigNumber; returnData: string[] }
-    >;
-
-    blockAndAggregate(
-      calls: { target: string; callData: BytesLike }[],
-      overrides?: CallOverrides
-    ): Promise<
-      [
-        BigNumber,
-        string,
-        ([boolean, string] & { success: boolean; returnData: string })[]
-      ] & {
-        blockNumber: BigNumber;
-        blockHash: string;
-        returnData: ([boolean, string] & {
-          success: boolean;
-          returnData: string;
-        })[];
-      }
-    >;
-
-    getBlockHash(
-      blockNumber: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<string>;
-
-    getBlockNumber(overrides?: CallOverrides): Promise<BigNumber>;
-
-    getCurrentBlockCoinbase(overrides?: CallOverrides): Promise<string>;
-
-    getCurrentBlockDifficulty(overrides?: CallOverrides): Promise<BigNumber>;
-
-    getCurrentBlockGasLimit(overrides?: CallOverrides): Promise<BigNumber>;
-
-    getCurrentBlockTimestamp(overrides?: CallOverrides): Promise<BigNumber>;
-
-    getEthBalance(addr: string, overrides?: CallOverrides): Promise<BigNumber>;
-
-    getLastBlockHash(overrides?: CallOverrides): Promise<string>;
-
-    tryAggregate(
-      requireSuccess: boolean,
-      calls: { target: string; callData: BytesLike }[],
-      overrides?: CallOverrides
-    ): Promise<
-      ([boolean, string] & { success: boolean; returnData: string })[]
-    >;
-
-    tryBlockAndAggregate(
-      requireSuccess: boolean,
-      calls: { target: string; callData: BytesLike }[],
-      overrides?: CallOverrides
-    ): Promise<
-      [
-        BigNumber,
-        string,
-        ([boolean, string] & { success: boolean; returnData: string })[]
-      ] & {
-        blockNumber: BigNumber;
-        blockHash: string;
-        returnData: ([boolean, string] & {
-          success: boolean;
-          returnData: string;
-        })[];
-      }
-    >;
-  };
-
-  filters: {};
-
-  estimateGas: {
-    aggregate(
-      calls: { target: string; callData: BytesLike }[],
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    blockAndAggregate(
-      calls: { target: string; callData: BytesLike }[],
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    getBlockHash(
-      blockNumber: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    getBlockNumber(overrides?: CallOverrides): Promise<BigNumber>;
-
-    getCurrentBlockCoinbase(overrides?: CallOverrides): Promise<BigNumber>;
-
-    getCurrentBlockDifficulty(overrides?: CallOverrides): Promise<BigNumber>;
-
-    getCurrentBlockGasLimit(overrides?: CallOverrides): Promise<BigNumber>;
-
-    getCurrentBlockTimestamp(overrides?: CallOverrides): Promise<BigNumber>;
-
-    getEthBalance(addr: string, overrides?: CallOverrides): Promise<BigNumber>;
-
-    getLastBlockHash(overrides?: CallOverrides): Promise<BigNumber>;
-
-    tryAggregate(
-      requireSuccess: boolean,
-      calls: { target: string; callData: BytesLike }[],
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    tryBlockAndAggregate(
-      requireSuccess: boolean,
-      calls: { target: string; callData: BytesLike }[],
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-  };
-
-  populateTransaction: {
-    aggregate(
-      calls: { target: string; callData: BytesLike }[],
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    blockAndAggregate(
-      calls: { target: string; callData: BytesLike }[],
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    getBlockHash(
-      blockNumber: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    getBlockNumber(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    getCurrentBlockCoinbase(
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    getCurrentBlockDifficulty(
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    getCurrentBlockGasLimit(
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    getCurrentBlockTimestamp(
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    getEthBalance(
-      addr: string,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    getLastBlockHash(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    tryAggregate(
-      requireSuccess: boolean,
-      calls: { target: string; callData: BytesLike }[],
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    tryBlockAndAggregate(
-      requireSuccess: boolean,
-      calls: { target: string; callData: BytesLike }[],
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-  };
-}
diff --git a/src/legacy/abis/types/Multicall2.ts b/src/legacy/abis/types/Multicall2.ts
deleted file mode 100644
index cc84ce495c..0000000000
--- a/src/legacy/abis/types/Multicall2.ts
+++ /dev/null
@@ -1,467 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-import type {
-  BaseContract,
-  BigNumber,
-  BigNumberish,
-  BytesLike,
-  CallOverrides,
-  ContractTransaction,
-  Overrides,
-  PopulatedTransaction,
-  Signer,
-  utils,
-} from "ethers";
-import type { FunctionFragment, Result } from "@ethersproject/abi";
-import type { Listener, Provider } from "@ethersproject/providers";
-import type {
-  TypedEventFilter,
-  TypedEvent,
-  TypedListener,
-  OnEvent,
-  PromiseOrValue,
-} from "./common";
-
-export declare namespace Multicall2 {
-  export type CallStruct = {
-    target: PromiseOrValue<string>;
-    callData: PromiseOrValue<BytesLike>;
-  };
-
-  export type CallStructOutput = [string, string] & {
-    target: string;
-    callData: string;
-  };
-
-  export type ResultStruct = {
-    success: PromiseOrValue<boolean>;
-    returnData: PromiseOrValue<BytesLike>;
-  };
-
-  export type ResultStructOutput = [boolean, string] & {
-    success: boolean;
-    returnData: string;
-  };
-}
-
-export interface Multicall2Interface extends utils.Interface {
-  functions: {
-    "aggregate((address,bytes)[])": FunctionFragment;
-    "blockAndAggregate((address,bytes)[])": FunctionFragment;
-    "getBlockHash(uint256)": FunctionFragment;
-    "getBlockNumber()": FunctionFragment;
-    "getCurrentBlockCoinbase()": FunctionFragment;
-    "getCurrentBlockDifficulty()": FunctionFragment;
-    "getCurrentBlockGasLimit()": FunctionFragment;
-    "getCurrentBlockTimestamp()": FunctionFragment;
-    "getEthBalance(address)": FunctionFragment;
-    "getLastBlockHash()": FunctionFragment;
-    "tryAggregate(bool,(address,bytes)[])": FunctionFragment;
-    "tryBlockAndAggregate(bool,(address,bytes)[])": FunctionFragment;
-  };
-
-  getFunction(
-    nameOrSignatureOrTopic:
-      | "aggregate"
-      | "blockAndAggregate"
-      | "getBlockHash"
-      | "getBlockNumber"
-      | "getCurrentBlockCoinbase"
-      | "getCurrentBlockDifficulty"
-      | "getCurrentBlockGasLimit"
-      | "getCurrentBlockTimestamp"
-      | "getEthBalance"
-      | "getLastBlockHash"
-      | "tryAggregate"
-      | "tryBlockAndAggregate"
-  ): FunctionFragment;
-
-  encodeFunctionData(
-    functionFragment: "aggregate",
-    values: [Multicall2.CallStruct[]]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "blockAndAggregate",
-    values: [Multicall2.CallStruct[]]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "getBlockHash",
-    values: [PromiseOrValue<BigNumberish>]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "getBlockNumber",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "getCurrentBlockCoinbase",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "getCurrentBlockDifficulty",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "getCurrentBlockGasLimit",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "getCurrentBlockTimestamp",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "getEthBalance",
-    values: [PromiseOrValue<string>]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "getLastBlockHash",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "tryAggregate",
-    values: [PromiseOrValue<boolean>, Multicall2.CallStruct[]]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "tryBlockAndAggregate",
-    values: [PromiseOrValue<boolean>, Multicall2.CallStruct[]]
-  ): string;
-
-  decodeFunctionResult(functionFragment: "aggregate", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "blockAndAggregate",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "getBlockHash",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "getBlockNumber",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "getCurrentBlockCoinbase",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "getCurrentBlockDifficulty",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "getCurrentBlockGasLimit",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "getCurrentBlockTimestamp",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "getEthBalance",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "getLastBlockHash",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "tryAggregate",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "tryBlockAndAggregate",
-    data: BytesLike
-  ): Result;
-
-  events: {};
-}
-
-export interface Multicall2 extends BaseContract {
-  connect(signerOrProvider: Signer | Provider | string): this;
-  attach(addressOrName: string): this;
-  deployed(): Promise<this>;
-
-  interface: Multicall2Interface;
-
-  queryFilter<TEvent extends TypedEvent>(
-    event: TypedEventFilter<TEvent>,
-    fromBlockOrBlockhash?: string | number | undefined,
-    toBlock?: string | number | undefined
-  ): Promise<Array<TEvent>>;
-
-  listeners<TEvent extends TypedEvent>(
-    eventFilter?: TypedEventFilter<TEvent>
-  ): Array<TypedListener<TEvent>>;
-  listeners(eventName?: string): Array<Listener>;
-  removeAllListeners<TEvent extends TypedEvent>(
-    eventFilter: TypedEventFilter<TEvent>
-  ): this;
-  removeAllListeners(eventName?: string): this;
-  off: OnEvent<this>;
-  on: OnEvent<this>;
-  once: OnEvent<this>;
-  removeListener: OnEvent<this>;
-
-  functions: {
-    aggregate(
-      calls: Multicall2.CallStruct[],
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<ContractTransaction>;
-
-    blockAndAggregate(
-      calls: Multicall2.CallStruct[],
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<ContractTransaction>;
-
-    getBlockHash(
-      blockNumber: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<[string] & { blockHash: string }>;
-
-    getBlockNumber(
-      overrides?: CallOverrides
-    ): Promise<[BigNumber] & { blockNumber: BigNumber }>;
-
-    getCurrentBlockCoinbase(
-      overrides?: CallOverrides
-    ): Promise<[string] & { coinbase: string }>;
-
-    getCurrentBlockDifficulty(
-      overrides?: CallOverrides
-    ): Promise<[BigNumber] & { difficulty: BigNumber }>;
-
-    getCurrentBlockGasLimit(
-      overrides?: CallOverrides
-    ): Promise<[BigNumber] & { gaslimit: BigNumber }>;
-
-    getCurrentBlockTimestamp(
-      overrides?: CallOverrides
-    ): Promise<[BigNumber] & { timestamp: BigNumber }>;
-
-    getEthBalance(
-      addr: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<[BigNumber] & { balance: BigNumber }>;
-
-    getLastBlockHash(
-      overrides?: CallOverrides
-    ): Promise<[string] & { blockHash: string }>;
-
-    tryAggregate(
-      requireSuccess: PromiseOrValue<boolean>,
-      calls: Multicall2.CallStruct[],
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<ContractTransaction>;
-
-    tryBlockAndAggregate(
-      requireSuccess: PromiseOrValue<boolean>,
-      calls: Multicall2.CallStruct[],
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<ContractTransaction>;
-  };
-
-  aggregate(
-    calls: Multicall2.CallStruct[],
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
-  ): Promise<ContractTransaction>;
-
-  blockAndAggregate(
-    calls: Multicall2.CallStruct[],
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
-  ): Promise<ContractTransaction>;
-
-  getBlockHash(
-    blockNumber: PromiseOrValue<BigNumberish>,
-    overrides?: CallOverrides
-  ): Promise<string>;
-
-  getBlockNumber(overrides?: CallOverrides): Promise<BigNumber>;
-
-  getCurrentBlockCoinbase(overrides?: CallOverrides): Promise<string>;
-
-  getCurrentBlockDifficulty(overrides?: CallOverrides): Promise<BigNumber>;
-
-  getCurrentBlockGasLimit(overrides?: CallOverrides): Promise<BigNumber>;
-
-  getCurrentBlockTimestamp(overrides?: CallOverrides): Promise<BigNumber>;
-
-  getEthBalance(
-    addr: PromiseOrValue<string>,
-    overrides?: CallOverrides
-  ): Promise<BigNumber>;
-
-  getLastBlockHash(overrides?: CallOverrides): Promise<string>;
-
-  tryAggregate(
-    requireSuccess: PromiseOrValue<boolean>,
-    calls: Multicall2.CallStruct[],
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
-  ): Promise<ContractTransaction>;
-
-  tryBlockAndAggregate(
-    requireSuccess: PromiseOrValue<boolean>,
-    calls: Multicall2.CallStruct[],
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
-  ): Promise<ContractTransaction>;
-
-  callStatic: {
-    aggregate(
-      calls: Multicall2.CallStruct[],
-      overrides?: CallOverrides
-    ): Promise<
-      [BigNumber, string[]] & { blockNumber: BigNumber; returnData: string[] }
-    >;
-
-    blockAndAggregate(
-      calls: Multicall2.CallStruct[],
-      overrides?: CallOverrides
-    ): Promise<
-      [BigNumber, string, Multicall2.ResultStructOutput[]] & {
-        blockNumber: BigNumber;
-        blockHash: string;
-        returnData: Multicall2.ResultStructOutput[];
-      }
-    >;
-
-    getBlockHash(
-      blockNumber: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<string>;
-
-    getBlockNumber(overrides?: CallOverrides): Promise<BigNumber>;
-
-    getCurrentBlockCoinbase(overrides?: CallOverrides): Promise<string>;
-
-    getCurrentBlockDifficulty(overrides?: CallOverrides): Promise<BigNumber>;
-
-    getCurrentBlockGasLimit(overrides?: CallOverrides): Promise<BigNumber>;
-
-    getCurrentBlockTimestamp(overrides?: CallOverrides): Promise<BigNumber>;
-
-    getEthBalance(
-      addr: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    getLastBlockHash(overrides?: CallOverrides): Promise<string>;
-
-    tryAggregate(
-      requireSuccess: PromiseOrValue<boolean>,
-      calls: Multicall2.CallStruct[],
-      overrides?: CallOverrides
-    ): Promise<Multicall2.ResultStructOutput[]>;
-
-    tryBlockAndAggregate(
-      requireSuccess: PromiseOrValue<boolean>,
-      calls: Multicall2.CallStruct[],
-      overrides?: CallOverrides
-    ): Promise<
-      [BigNumber, string, Multicall2.ResultStructOutput[]] & {
-        blockNumber: BigNumber;
-        blockHash: string;
-        returnData: Multicall2.ResultStructOutput[];
-      }
-    >;
-  };
-
-  filters: {};
-
-  estimateGas: {
-    aggregate(
-      calls: Multicall2.CallStruct[],
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<BigNumber>;
-
-    blockAndAggregate(
-      calls: Multicall2.CallStruct[],
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<BigNumber>;
-
-    getBlockHash(
-      blockNumber: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    getBlockNumber(overrides?: CallOverrides): Promise<BigNumber>;
-
-    getCurrentBlockCoinbase(overrides?: CallOverrides): Promise<BigNumber>;
-
-    getCurrentBlockDifficulty(overrides?: CallOverrides): Promise<BigNumber>;
-
-    getCurrentBlockGasLimit(overrides?: CallOverrides): Promise<BigNumber>;
-
-    getCurrentBlockTimestamp(overrides?: CallOverrides): Promise<BigNumber>;
-
-    getEthBalance(
-      addr: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    getLastBlockHash(overrides?: CallOverrides): Promise<BigNumber>;
-
-    tryAggregate(
-      requireSuccess: PromiseOrValue<boolean>,
-      calls: Multicall2.CallStruct[],
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<BigNumber>;
-
-    tryBlockAndAggregate(
-      requireSuccess: PromiseOrValue<boolean>,
-      calls: Multicall2.CallStruct[],
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<BigNumber>;
-  };
-
-  populateTransaction: {
-    aggregate(
-      calls: Multicall2.CallStruct[],
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<PopulatedTransaction>;
-
-    blockAndAggregate(
-      calls: Multicall2.CallStruct[],
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<PopulatedTransaction>;
-
-    getBlockHash(
-      blockNumber: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    getBlockNumber(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    getCurrentBlockCoinbase(
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    getCurrentBlockDifficulty(
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    getCurrentBlockGasLimit(
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    getCurrentBlockTimestamp(
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    getEthBalance(
-      addr: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    getLastBlockHash(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    tryAggregate(
-      requireSuccess: PromiseOrValue<boolean>,
-      calls: Multicall2.CallStruct[],
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<PopulatedTransaction>;
-
-    tryBlockAndAggregate(
-      requireSuccess: PromiseOrValue<boolean>,
-      calls: Multicall2.CallStruct[],
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<PopulatedTransaction>;
-  };
-}
diff --git a/src/legacy/abis/types/Unisocks.d.ts b/src/legacy/abis/types/Unisocks.d.ts
deleted file mode 100644
index 6550ddc6b7..0000000000
--- a/src/legacy/abis/types/Unisocks.d.ts
+++ /dev/null
@@ -1,782 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-
-import {
-  ethers,
-  EventFilter,
-  Signer,
-  BigNumber,
-  BigNumberish,
-  PopulatedTransaction,
-  BaseContract,
-  ContractTransaction,
-  Overrides,
-  CallOverrides,
-} from "ethers";
-import { BytesLike } from "@ethersproject/bytes";
-import { Listener, Provider } from "@ethersproject/providers";
-import { FunctionFragment, EventFragment, Result } from "@ethersproject/abi";
-import type { TypedEventFilter, TypedEvent, TypedListener } from "./common";
-
-interface UnisocksInterface extends ethers.utils.Interface {
-  functions: {
-    "tokenURI(uint256)": FunctionFragment;
-    "tokenByIndex(uint256)": FunctionFragment;
-    "tokenOfOwnerByIndex(address,uint256)": FunctionFragment;
-    "transferFrom(address,address,uint256)": FunctionFragment;
-    "safeTransferFrom(address,address,uint256)": FunctionFragment;
-    "approve(address,uint256)": FunctionFragment;
-    "setApprovalForAll(address,bool)": FunctionFragment;
-    "mint(address)": FunctionFragment;
-    "changeMinter(address)": FunctionFragment;
-    "changeURI(address)": FunctionFragment;
-    "name()": FunctionFragment;
-    "symbol()": FunctionFragment;
-    "totalSupply()": FunctionFragment;
-    "minter()": FunctionFragment;
-    "socks()": FunctionFragment;
-    "newURI()": FunctionFragment;
-    "ownerOf(uint256)": FunctionFragment;
-    "balanceOf(address)": FunctionFragment;
-    "getApproved(uint256)": FunctionFragment;
-    "isApprovedForAll(address,address)": FunctionFragment;
-    "supportsInterface(bytes32)": FunctionFragment;
-  };
-
-  encodeFunctionData(
-    functionFragment: "tokenURI",
-    values: [BigNumberish]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "tokenByIndex",
-    values: [BigNumberish]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "tokenOfOwnerByIndex",
-    values: [string, BigNumberish]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "transferFrom",
-    values: [string, string, BigNumberish]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "safeTransferFrom",
-    values: [string, string, BigNumberish]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "approve",
-    values: [string, BigNumberish]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "setApprovalForAll",
-    values: [string, boolean]
-  ): string;
-  encodeFunctionData(functionFragment: "mint", values: [string]): string;
-  encodeFunctionData(
-    functionFragment: "changeMinter",
-    values: [string]
-  ): string;
-  encodeFunctionData(functionFragment: "changeURI", values: [string]): string;
-  encodeFunctionData(functionFragment: "name", values?: undefined): string;
-  encodeFunctionData(functionFragment: "symbol", values?: undefined): string;
-  encodeFunctionData(
-    functionFragment: "totalSupply",
-    values?: undefined
-  ): string;
-  encodeFunctionData(functionFragment: "minter", values?: undefined): string;
-  encodeFunctionData(functionFragment: "socks", values?: undefined): string;
-  encodeFunctionData(functionFragment: "newURI", values?: undefined): string;
-  encodeFunctionData(
-    functionFragment: "ownerOf",
-    values: [BigNumberish]
-  ): string;
-  encodeFunctionData(functionFragment: "balanceOf", values: [string]): string;
-  encodeFunctionData(
-    functionFragment: "getApproved",
-    values: [BigNumberish]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "isApprovedForAll",
-    values: [string, string]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "supportsInterface",
-    values: [BytesLike]
-  ): string;
-
-  decodeFunctionResult(functionFragment: "tokenURI", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "tokenByIndex",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "tokenOfOwnerByIndex",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "transferFrom",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "safeTransferFrom",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "approve", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "setApprovalForAll",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "mint", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "changeMinter",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "changeURI", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "name", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "symbol", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "totalSupply",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "minter", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "socks", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "newURI", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "ownerOf", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "balanceOf", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "getApproved",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "isApprovedForAll",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "supportsInterface",
-    data: BytesLike
-  ): Result;
-
-  events: {
-    "Transfer(address,address,uint256)": EventFragment;
-    "Approval(address,address,uint256)": EventFragment;
-    "ApprovalForAll(address,address,bool)": EventFragment;
-  };
-
-  getEvent(nameOrSignatureOrTopic: "Transfer"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "Approval"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "ApprovalForAll"): EventFragment;
-}
-
-export type TransferEvent = TypedEvent<
-  [string, string, BigNumber] & {
-    _from: string;
-    _to: string;
-    _tokenId: BigNumber;
-  }
->;
-
-export type ApprovalEvent = TypedEvent<
-  [string, string, BigNumber] & {
-    _owner: string;
-    _approved: string;
-    _tokenId: BigNumber;
-  }
->;
-
-export type ApprovalForAllEvent = TypedEvent<
-  [string, string, boolean] & {
-    _owner: string;
-    _operator: string;
-    _approved: boolean;
-  }
->;
-
-export class Unisocks extends BaseContract {
-  connect(signerOrProvider: Signer | Provider | string): this;
-  attach(addressOrName: string): this;
-  deployed(): Promise<this>;
-
-  listeners<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter?: TypedEventFilter<EventArgsArray, EventArgsObject>
-  ): Array<TypedListener<EventArgsArray, EventArgsObject>>;
-  off<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    listener: TypedListener<EventArgsArray, EventArgsObject>
-  ): this;
-  on<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    listener: TypedListener<EventArgsArray, EventArgsObject>
-  ): this;
-  once<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    listener: TypedListener<EventArgsArray, EventArgsObject>
-  ): this;
-  removeListener<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    listener: TypedListener<EventArgsArray, EventArgsObject>
-  ): this;
-  removeAllListeners<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>
-  ): this;
-
-  listeners(eventName?: string): Array<Listener>;
-  off(eventName: string, listener: Listener): this;
-  on(eventName: string, listener: Listener): this;
-  once(eventName: string, listener: Listener): this;
-  removeListener(eventName: string, listener: Listener): this;
-  removeAllListeners(eventName?: string): this;
-
-  queryFilter<EventArgsArray extends Array<any>, EventArgsObject>(
-    event: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    fromBlockOrBlockhash?: string | number | undefined,
-    toBlock?: string | number | undefined
-  ): Promise<Array<TypedEvent<EventArgsArray & EventArgsObject>>>;
-
-  interface: UnisocksInterface;
-
-  functions: {
-    tokenURI(
-      _tokenId: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<[string] & { out: string }>;
-
-    tokenByIndex(
-      _index: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<[BigNumber] & { out: BigNumber }>;
-
-    tokenOfOwnerByIndex(
-      _owner: string,
-      _index: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<[BigNumber] & { out: BigNumber }>;
-
-    transferFrom(
-      _from: string,
-      _to: string,
-      _tokenId: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    "safeTransferFrom(address,address,uint256)"(
-      _from: string,
-      _to: string,
-      _tokenId: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    "safeTransferFrom(address,address,uint256,bytes)"(
-      _from: string,
-      _to: string,
-      _tokenId: BigNumberish,
-      _data: BytesLike,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    approve(
-      _approved: string,
-      _tokenId: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    setApprovalForAll(
-      _operator: string,
-      _approved: boolean,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    mint(
-      _to: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    changeMinter(
-      _minter: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    changeURI(
-      _newURI: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    name(overrides?: CallOverrides): Promise<[string] & { out: string }>;
-
-    symbol(overrides?: CallOverrides): Promise<[string] & { out: string }>;
-
-    totalSupply(
-      overrides?: CallOverrides
-    ): Promise<[BigNumber] & { out: BigNumber }>;
-
-    minter(overrides?: CallOverrides): Promise<[string] & { out: string }>;
-
-    socks(overrides?: CallOverrides): Promise<[string] & { out: string }>;
-
-    newURI(overrides?: CallOverrides): Promise<[string] & { out: string }>;
-
-    ownerOf(
-      arg0: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<[string] & { out: string }>;
-
-    balanceOf(
-      arg0: string,
-      overrides?: CallOverrides
-    ): Promise<[BigNumber] & { out: BigNumber }>;
-
-    getApproved(
-      arg0: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<[string] & { out: string }>;
-
-    isApprovedForAll(
-      arg0: string,
-      arg1: string,
-      overrides?: CallOverrides
-    ): Promise<[boolean] & { out: boolean }>;
-
-    supportsInterface(
-      arg0: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<[boolean] & { out: boolean }>;
-  };
-
-  tokenURI(_tokenId: BigNumberish, overrides?: CallOverrides): Promise<string>;
-
-  tokenByIndex(
-    _index: BigNumberish,
-    overrides?: CallOverrides
-  ): Promise<BigNumber>;
-
-  tokenOfOwnerByIndex(
-    _owner: string,
-    _index: BigNumberish,
-    overrides?: CallOverrides
-  ): Promise<BigNumber>;
-
-  transferFrom(
-    _from: string,
-    _to: string,
-    _tokenId: BigNumberish,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  "safeTransferFrom(address,address,uint256)"(
-    _from: string,
-    _to: string,
-    _tokenId: BigNumberish,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  "safeTransferFrom(address,address,uint256,bytes)"(
-    _from: string,
-    _to: string,
-    _tokenId: BigNumberish,
-    _data: BytesLike,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  approve(
-    _approved: string,
-    _tokenId: BigNumberish,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  setApprovalForAll(
-    _operator: string,
-    _approved: boolean,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  mint(
-    _to: string,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  changeMinter(
-    _minter: string,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  changeURI(
-    _newURI: string,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  name(overrides?: CallOverrides): Promise<string>;
-
-  symbol(overrides?: CallOverrides): Promise<string>;
-
-  totalSupply(overrides?: CallOverrides): Promise<BigNumber>;
-
-  minter(overrides?: CallOverrides): Promise<string>;
-
-  socks(overrides?: CallOverrides): Promise<string>;
-
-  newURI(overrides?: CallOverrides): Promise<string>;
-
-  ownerOf(arg0: BigNumberish, overrides?: CallOverrides): Promise<string>;
-
-  balanceOf(arg0: string, overrides?: CallOverrides): Promise<BigNumber>;
-
-  getApproved(arg0: BigNumberish, overrides?: CallOverrides): Promise<string>;
-
-  isApprovedForAll(
-    arg0: string,
-    arg1: string,
-    overrides?: CallOverrides
-  ): Promise<boolean>;
-
-  supportsInterface(
-    arg0: BytesLike,
-    overrides?: CallOverrides
-  ): Promise<boolean>;
-
-  callStatic: {
-    tokenURI(
-      _tokenId: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<string>;
-
-    tokenByIndex(
-      _index: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    tokenOfOwnerByIndex(
-      _owner: string,
-      _index: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    transferFrom(
-      _from: string,
-      _to: string,
-      _tokenId: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    "safeTransferFrom(address,address,uint256)"(
-      _from: string,
-      _to: string,
-      _tokenId: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    "safeTransferFrom(address,address,uint256,bytes)"(
-      _from: string,
-      _to: string,
-      _tokenId: BigNumberish,
-      _data: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    approve(
-      _approved: string,
-      _tokenId: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    setApprovalForAll(
-      _operator: string,
-      _approved: boolean,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    mint(_to: string, overrides?: CallOverrides): Promise<boolean>;
-
-    changeMinter(_minter: string, overrides?: CallOverrides): Promise<void>;
-
-    changeURI(_newURI: string, overrides?: CallOverrides): Promise<void>;
-
-    name(overrides?: CallOverrides): Promise<string>;
-
-    symbol(overrides?: CallOverrides): Promise<string>;
-
-    totalSupply(overrides?: CallOverrides): Promise<BigNumber>;
-
-    minter(overrides?: CallOverrides): Promise<string>;
-
-    socks(overrides?: CallOverrides): Promise<string>;
-
-    newURI(overrides?: CallOverrides): Promise<string>;
-
-    ownerOf(arg0: BigNumberish, overrides?: CallOverrides): Promise<string>;
-
-    balanceOf(arg0: string, overrides?: CallOverrides): Promise<BigNumber>;
-
-    getApproved(arg0: BigNumberish, overrides?: CallOverrides): Promise<string>;
-
-    isApprovedForAll(
-      arg0: string,
-      arg1: string,
-      overrides?: CallOverrides
-    ): Promise<boolean>;
-
-    supportsInterface(
-      arg0: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<boolean>;
-  };
-
-  filters: {
-    "Transfer(address,address,uint256)"(
-      _from?: string | null,
-      _to?: string | null,
-      _tokenId?: BigNumberish | null
-    ): TypedEventFilter<
-      [string, string, BigNumber],
-      { _from: string; _to: string; _tokenId: BigNumber }
-    >;
-
-    Transfer(
-      _from?: string | null,
-      _to?: string | null,
-      _tokenId?: BigNumberish | null
-    ): TypedEventFilter<
-      [string, string, BigNumber],
-      { _from: string; _to: string; _tokenId: BigNumber }
-    >;
-
-    "Approval(address,address,uint256)"(
-      _owner?: string | null,
-      _approved?: string | null,
-      _tokenId?: BigNumberish | null
-    ): TypedEventFilter<
-      [string, string, BigNumber],
-      { _owner: string; _approved: string; _tokenId: BigNumber }
-    >;
-
-    Approval(
-      _owner?: string | null,
-      _approved?: string | null,
-      _tokenId?: BigNumberish | null
-    ): TypedEventFilter<
-      [string, string, BigNumber],
-      { _owner: string; _approved: string; _tokenId: BigNumber }
-    >;
-
-    "ApprovalForAll(address,address,bool)"(
-      _owner?: string | null,
-      _operator?: string | null,
-      _approved?: null
-    ): TypedEventFilter<
-      [string, string, boolean],
-      { _owner: string; _operator: string; _approved: boolean }
-    >;
-
-    ApprovalForAll(
-      _owner?: string | null,
-      _operator?: string | null,
-      _approved?: null
-    ): TypedEventFilter<
-      [string, string, boolean],
-      { _owner: string; _operator: string; _approved: boolean }
-    >;
-  };
-
-  estimateGas: {
-    tokenURI(
-      _tokenId: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    tokenByIndex(
-      _index: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    tokenOfOwnerByIndex(
-      _owner: string,
-      _index: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    transferFrom(
-      _from: string,
-      _to: string,
-      _tokenId: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    "safeTransferFrom(address,address,uint256)"(
-      _from: string,
-      _to: string,
-      _tokenId: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    "safeTransferFrom(address,address,uint256,bytes)"(
-      _from: string,
-      _to: string,
-      _tokenId: BigNumberish,
-      _data: BytesLike,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    approve(
-      _approved: string,
-      _tokenId: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    setApprovalForAll(
-      _operator: string,
-      _approved: boolean,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    mint(
-      _to: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    changeMinter(
-      _minter: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    changeURI(
-      _newURI: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    name(overrides?: CallOverrides): Promise<BigNumber>;
-
-    symbol(overrides?: CallOverrides): Promise<BigNumber>;
-
-    totalSupply(overrides?: CallOverrides): Promise<BigNumber>;
-
-    minter(overrides?: CallOverrides): Promise<BigNumber>;
-
-    socks(overrides?: CallOverrides): Promise<BigNumber>;
-
-    newURI(overrides?: CallOverrides): Promise<BigNumber>;
-
-    ownerOf(arg0: BigNumberish, overrides?: CallOverrides): Promise<BigNumber>;
-
-    balanceOf(arg0: string, overrides?: CallOverrides): Promise<BigNumber>;
-
-    getApproved(
-      arg0: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    isApprovedForAll(
-      arg0: string,
-      arg1: string,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    supportsInterface(
-      arg0: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-  };
-
-  populateTransaction: {
-    tokenURI(
-      _tokenId: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    tokenByIndex(
-      _index: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    tokenOfOwnerByIndex(
-      _owner: string,
-      _index: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    transferFrom(
-      _from: string,
-      _to: string,
-      _tokenId: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    "safeTransferFrom(address,address,uint256)"(
-      _from: string,
-      _to: string,
-      _tokenId: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    "safeTransferFrom(address,address,uint256,bytes)"(
-      _from: string,
-      _to: string,
-      _tokenId: BigNumberish,
-      _data: BytesLike,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    approve(
-      _approved: string,
-      _tokenId: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    setApprovalForAll(
-      _operator: string,
-      _approved: boolean,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    mint(
-      _to: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    changeMinter(
-      _minter: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    changeURI(
-      _newURI: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    name(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    symbol(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    totalSupply(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    minter(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    socks(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    newURI(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    ownerOf(
-      arg0: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    balanceOf(
-      arg0: string,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    getApproved(
-      arg0: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    isApprovedForAll(
-      arg0: string,
-      arg1: string,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    supportsInterface(
-      arg0: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-  };
-}
diff --git a/src/legacy/abis/types/Unisocks.ts b/src/legacy/abis/types/Unisocks.ts
deleted file mode 100644
index 35c5f3f653..0000000000
--- a/src/legacy/abis/types/Unisocks.ts
+++ /dev/null
@@ -1,857 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-import type {
-  BaseContract,
-  BigNumber,
-  BigNumberish,
-  BytesLike,
-  CallOverrides,
-  ContractTransaction,
-  Overrides,
-  PopulatedTransaction,
-  Signer,
-  utils,
-} from "ethers";
-import type {
-  FunctionFragment,
-  Result,
-  EventFragment,
-} from "@ethersproject/abi";
-import type { Listener, Provider } from "@ethersproject/providers";
-import type {
-  TypedEventFilter,
-  TypedEvent,
-  TypedListener,
-  OnEvent,
-  PromiseOrValue,
-} from "./common";
-
-export interface UnisocksInterface extends utils.Interface {
-  functions: {
-    "tokenURI(uint256)": FunctionFragment;
-    "tokenByIndex(uint256)": FunctionFragment;
-    "tokenOfOwnerByIndex(address,uint256)": FunctionFragment;
-    "transferFrom(address,address,uint256)": FunctionFragment;
-    "safeTransferFrom(address,address,uint256)": FunctionFragment;
-    "safeTransferFrom(address,address,uint256,bytes)": FunctionFragment;
-    "approve(address,uint256)": FunctionFragment;
-    "setApprovalForAll(address,bool)": FunctionFragment;
-    "mint(address)": FunctionFragment;
-    "changeMinter(address)": FunctionFragment;
-    "changeURI(address)": FunctionFragment;
-    "name()": FunctionFragment;
-    "symbol()": FunctionFragment;
-    "totalSupply()": FunctionFragment;
-    "minter()": FunctionFragment;
-    "socks()": FunctionFragment;
-    "newURI()": FunctionFragment;
-    "ownerOf(uint256)": FunctionFragment;
-    "balanceOf(address)": FunctionFragment;
-    "getApproved(uint256)": FunctionFragment;
-    "isApprovedForAll(address,address)": FunctionFragment;
-    "supportsInterface(bytes32)": FunctionFragment;
-  };
-
-  getFunction(
-    nameOrSignatureOrTopic:
-      | "tokenURI"
-      | "tokenByIndex"
-      | "tokenOfOwnerByIndex"
-      | "transferFrom"
-      | "safeTransferFrom(address,address,uint256)"
-      | "safeTransferFrom(address,address,uint256,bytes)"
-      | "approve"
-      | "setApprovalForAll"
-      | "mint"
-      | "changeMinter"
-      | "changeURI"
-      | "name"
-      | "symbol"
-      | "totalSupply"
-      | "minter"
-      | "socks"
-      | "newURI"
-      | "ownerOf"
-      | "balanceOf"
-      | "getApproved"
-      | "isApprovedForAll"
-      | "supportsInterface"
-  ): FunctionFragment;
-
-  encodeFunctionData(
-    functionFragment: "tokenURI",
-    values: [PromiseOrValue<BigNumberish>]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "tokenByIndex",
-    values: [PromiseOrValue<BigNumberish>]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "tokenOfOwnerByIndex",
-    values: [PromiseOrValue<string>, PromiseOrValue<BigNumberish>]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "transferFrom",
-    values: [
-      PromiseOrValue<string>,
-      PromiseOrValue<string>,
-      PromiseOrValue<BigNumberish>
-    ]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "safeTransferFrom(address,address,uint256)",
-    values: [
-      PromiseOrValue<string>,
-      PromiseOrValue<string>,
-      PromiseOrValue<BigNumberish>
-    ]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "safeTransferFrom(address,address,uint256,bytes)",
-    values: [
-      PromiseOrValue<string>,
-      PromiseOrValue<string>,
-      PromiseOrValue<BigNumberish>,
-      PromiseOrValue<BytesLike>
-    ]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "approve",
-    values: [PromiseOrValue<string>, PromiseOrValue<BigNumberish>]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "setApprovalForAll",
-    values: [PromiseOrValue<string>, PromiseOrValue<boolean>]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "mint",
-    values: [PromiseOrValue<string>]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "changeMinter",
-    values: [PromiseOrValue<string>]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "changeURI",
-    values: [PromiseOrValue<string>]
-  ): string;
-  encodeFunctionData(functionFragment: "name", values?: undefined): string;
-  encodeFunctionData(functionFragment: "symbol", values?: undefined): string;
-  encodeFunctionData(
-    functionFragment: "totalSupply",
-    values?: undefined
-  ): string;
-  encodeFunctionData(functionFragment: "minter", values?: undefined): string;
-  encodeFunctionData(functionFragment: "socks", values?: undefined): string;
-  encodeFunctionData(functionFragment: "newURI", values?: undefined): string;
-  encodeFunctionData(
-    functionFragment: "ownerOf",
-    values: [PromiseOrValue<BigNumberish>]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "balanceOf",
-    values: [PromiseOrValue<string>]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "getApproved",
-    values: [PromiseOrValue<BigNumberish>]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "isApprovedForAll",
-    values: [PromiseOrValue<string>, PromiseOrValue<string>]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "supportsInterface",
-    values: [PromiseOrValue<BytesLike>]
-  ): string;
-
-  decodeFunctionResult(functionFragment: "tokenURI", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "tokenByIndex",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "tokenOfOwnerByIndex",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "transferFrom",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "safeTransferFrom(address,address,uint256)",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "safeTransferFrom(address,address,uint256,bytes)",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "approve", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "setApprovalForAll",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "mint", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "changeMinter",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "changeURI", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "name", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "symbol", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "totalSupply",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "minter", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "socks", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "newURI", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "ownerOf", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "balanceOf", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "getApproved",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "isApprovedForAll",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "supportsInterface",
-    data: BytesLike
-  ): Result;
-
-  events: {
-    "Transfer(address,address,uint256)": EventFragment;
-    "Approval(address,address,uint256)": EventFragment;
-    "ApprovalForAll(address,address,bool)": EventFragment;
-  };
-
-  getEvent(nameOrSignatureOrTopic: "Transfer"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "Approval"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "ApprovalForAll"): EventFragment;
-}
-
-export interface TransferEventObject {
-  _from: string;
-  _to: string;
-  _tokenId: BigNumber;
-}
-export type TransferEvent = TypedEvent<
-  [string, string, BigNumber],
-  TransferEventObject
->;
-
-export type TransferEventFilter = TypedEventFilter<TransferEvent>;
-
-export interface ApprovalEventObject {
-  _owner: string;
-  _approved: string;
-  _tokenId: BigNumber;
-}
-export type ApprovalEvent = TypedEvent<
-  [string, string, BigNumber],
-  ApprovalEventObject
->;
-
-export type ApprovalEventFilter = TypedEventFilter<ApprovalEvent>;
-
-export interface ApprovalForAllEventObject {
-  _owner: string;
-  _operator: string;
-  _approved: boolean;
-}
-export type ApprovalForAllEvent = TypedEvent<
-  [string, string, boolean],
-  ApprovalForAllEventObject
->;
-
-export type ApprovalForAllEventFilter = TypedEventFilter<ApprovalForAllEvent>;
-
-export interface Unisocks extends BaseContract {
-  connect(signerOrProvider: Signer | Provider | string): this;
-  attach(addressOrName: string): this;
-  deployed(): Promise<this>;
-
-  interface: UnisocksInterface;
-
-  queryFilter<TEvent extends TypedEvent>(
-    event: TypedEventFilter<TEvent>,
-    fromBlockOrBlockhash?: string | number | undefined,
-    toBlock?: string | number | undefined
-  ): Promise<Array<TEvent>>;
-
-  listeners<TEvent extends TypedEvent>(
-    eventFilter?: TypedEventFilter<TEvent>
-  ): Array<TypedListener<TEvent>>;
-  listeners(eventName?: string): Array<Listener>;
-  removeAllListeners<TEvent extends TypedEvent>(
-    eventFilter: TypedEventFilter<TEvent>
-  ): this;
-  removeAllListeners(eventName?: string): this;
-  off: OnEvent<this>;
-  on: OnEvent<this>;
-  once: OnEvent<this>;
-  removeListener: OnEvent<this>;
-
-  functions: {
-    tokenURI(
-      _tokenId: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<[string] & { out: string }>;
-
-    tokenByIndex(
-      _index: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<[BigNumber] & { out: BigNumber }>;
-
-    tokenOfOwnerByIndex(
-      _owner: PromiseOrValue<string>,
-      _index: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<[BigNumber] & { out: BigNumber }>;
-
-    transferFrom(
-      _from: PromiseOrValue<string>,
-      _to: PromiseOrValue<string>,
-      _tokenId: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<ContractTransaction>;
-
-    "safeTransferFrom(address,address,uint256)"(
-      _from: PromiseOrValue<string>,
-      _to: PromiseOrValue<string>,
-      _tokenId: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<ContractTransaction>;
-
-    "safeTransferFrom(address,address,uint256,bytes)"(
-      _from: PromiseOrValue<string>,
-      _to: PromiseOrValue<string>,
-      _tokenId: PromiseOrValue<BigNumberish>,
-      _data: PromiseOrValue<BytesLike>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<ContractTransaction>;
-
-    approve(
-      _approved: PromiseOrValue<string>,
-      _tokenId: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<ContractTransaction>;
-
-    setApprovalForAll(
-      _operator: PromiseOrValue<string>,
-      _approved: PromiseOrValue<boolean>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<ContractTransaction>;
-
-    mint(
-      _to: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<ContractTransaction>;
-
-    changeMinter(
-      _minter: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<ContractTransaction>;
-
-    changeURI(
-      _newURI: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<ContractTransaction>;
-
-    name(overrides?: CallOverrides): Promise<[string] & { out: string }>;
-
-    symbol(overrides?: CallOverrides): Promise<[string] & { out: string }>;
-
-    totalSupply(
-      overrides?: CallOverrides
-    ): Promise<[BigNumber] & { out: BigNumber }>;
-
-    minter(overrides?: CallOverrides): Promise<[string] & { out: string }>;
-
-    socks(overrides?: CallOverrides): Promise<[string] & { out: string }>;
-
-    newURI(overrides?: CallOverrides): Promise<[string] & { out: string }>;
-
-    ownerOf(
-      arg0: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<[string] & { out: string }>;
-
-    balanceOf(
-      arg0: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<[BigNumber] & { out: BigNumber }>;
-
-    getApproved(
-      arg0: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<[string] & { out: string }>;
-
-    isApprovedForAll(
-      arg0: PromiseOrValue<string>,
-      arg1: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<[boolean] & { out: boolean }>;
-
-    supportsInterface(
-      arg0: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<[boolean] & { out: boolean }>;
-  };
-
-  tokenURI(
-    _tokenId: PromiseOrValue<BigNumberish>,
-    overrides?: CallOverrides
-  ): Promise<string>;
-
-  tokenByIndex(
-    _index: PromiseOrValue<BigNumberish>,
-    overrides?: CallOverrides
-  ): Promise<BigNumber>;
-
-  tokenOfOwnerByIndex(
-    _owner: PromiseOrValue<string>,
-    _index: PromiseOrValue<BigNumberish>,
-    overrides?: CallOverrides
-  ): Promise<BigNumber>;
-
-  transferFrom(
-    _from: PromiseOrValue<string>,
-    _to: PromiseOrValue<string>,
-    _tokenId: PromiseOrValue<BigNumberish>,
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
-  ): Promise<ContractTransaction>;
-
-  "safeTransferFrom(address,address,uint256)"(
-    _from: PromiseOrValue<string>,
-    _to: PromiseOrValue<string>,
-    _tokenId: PromiseOrValue<BigNumberish>,
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
-  ): Promise<ContractTransaction>;
-
-  "safeTransferFrom(address,address,uint256,bytes)"(
-    _from: PromiseOrValue<string>,
-    _to: PromiseOrValue<string>,
-    _tokenId: PromiseOrValue<BigNumberish>,
-    _data: PromiseOrValue<BytesLike>,
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
-  ): Promise<ContractTransaction>;
-
-  approve(
-    _approved: PromiseOrValue<string>,
-    _tokenId: PromiseOrValue<BigNumberish>,
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
-  ): Promise<ContractTransaction>;
-
-  setApprovalForAll(
-    _operator: PromiseOrValue<string>,
-    _approved: PromiseOrValue<boolean>,
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
-  ): Promise<ContractTransaction>;
-
-  mint(
-    _to: PromiseOrValue<string>,
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
-  ): Promise<ContractTransaction>;
-
-  changeMinter(
-    _minter: PromiseOrValue<string>,
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
-  ): Promise<ContractTransaction>;
-
-  changeURI(
-    _newURI: PromiseOrValue<string>,
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
-  ): Promise<ContractTransaction>;
-
-  name(overrides?: CallOverrides): Promise<string>;
-
-  symbol(overrides?: CallOverrides): Promise<string>;
-
-  totalSupply(overrides?: CallOverrides): Promise<BigNumber>;
-
-  minter(overrides?: CallOverrides): Promise<string>;
-
-  socks(overrides?: CallOverrides): Promise<string>;
-
-  newURI(overrides?: CallOverrides): Promise<string>;
-
-  ownerOf(
-    arg0: PromiseOrValue<BigNumberish>,
-    overrides?: CallOverrides
-  ): Promise<string>;
-
-  balanceOf(
-    arg0: PromiseOrValue<string>,
-    overrides?: CallOverrides
-  ): Promise<BigNumber>;
-
-  getApproved(
-    arg0: PromiseOrValue<BigNumberish>,
-    overrides?: CallOverrides
-  ): Promise<string>;
-
-  isApprovedForAll(
-    arg0: PromiseOrValue<string>,
-    arg1: PromiseOrValue<string>,
-    overrides?: CallOverrides
-  ): Promise<boolean>;
-
-  supportsInterface(
-    arg0: PromiseOrValue<BytesLike>,
-    overrides?: CallOverrides
-  ): Promise<boolean>;
-
-  callStatic: {
-    tokenURI(
-      _tokenId: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<string>;
-
-    tokenByIndex(
-      _index: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    tokenOfOwnerByIndex(
-      _owner: PromiseOrValue<string>,
-      _index: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    transferFrom(
-      _from: PromiseOrValue<string>,
-      _to: PromiseOrValue<string>,
-      _tokenId: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    "safeTransferFrom(address,address,uint256)"(
-      _from: PromiseOrValue<string>,
-      _to: PromiseOrValue<string>,
-      _tokenId: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    "safeTransferFrom(address,address,uint256,bytes)"(
-      _from: PromiseOrValue<string>,
-      _to: PromiseOrValue<string>,
-      _tokenId: PromiseOrValue<BigNumberish>,
-      _data: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    approve(
-      _approved: PromiseOrValue<string>,
-      _tokenId: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    setApprovalForAll(
-      _operator: PromiseOrValue<string>,
-      _approved: PromiseOrValue<boolean>,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    mint(
-      _to: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<boolean>;
-
-    changeMinter(
-      _minter: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    changeURI(
-      _newURI: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    name(overrides?: CallOverrides): Promise<string>;
-
-    symbol(overrides?: CallOverrides): Promise<string>;
-
-    totalSupply(overrides?: CallOverrides): Promise<BigNumber>;
-
-    minter(overrides?: CallOverrides): Promise<string>;
-
-    socks(overrides?: CallOverrides): Promise<string>;
-
-    newURI(overrides?: CallOverrides): Promise<string>;
-
-    ownerOf(
-      arg0: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<string>;
-
-    balanceOf(
-      arg0: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    getApproved(
-      arg0: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<string>;
-
-    isApprovedForAll(
-      arg0: PromiseOrValue<string>,
-      arg1: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<boolean>;
-
-    supportsInterface(
-      arg0: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<boolean>;
-  };
-
-  filters: {
-    "Transfer(address,address,uint256)"(
-      _from?: PromiseOrValue<string> | null,
-      _to?: PromiseOrValue<string> | null,
-      _tokenId?: PromiseOrValue<BigNumberish> | null
-    ): TransferEventFilter;
-    Transfer(
-      _from?: PromiseOrValue<string> | null,
-      _to?: PromiseOrValue<string> | null,
-      _tokenId?: PromiseOrValue<BigNumberish> | null
-    ): TransferEventFilter;
-
-    "Approval(address,address,uint256)"(
-      _owner?: PromiseOrValue<string> | null,
-      _approved?: PromiseOrValue<string> | null,
-      _tokenId?: PromiseOrValue<BigNumberish> | null
-    ): ApprovalEventFilter;
-    Approval(
-      _owner?: PromiseOrValue<string> | null,
-      _approved?: PromiseOrValue<string> | null,
-      _tokenId?: PromiseOrValue<BigNumberish> | null
-    ): ApprovalEventFilter;
-
-    "ApprovalForAll(address,address,bool)"(
-      _owner?: PromiseOrValue<string> | null,
-      _operator?: PromiseOrValue<string> | null,
-      _approved?: null
-    ): ApprovalForAllEventFilter;
-    ApprovalForAll(
-      _owner?: PromiseOrValue<string> | null,
-      _operator?: PromiseOrValue<string> | null,
-      _approved?: null
-    ): ApprovalForAllEventFilter;
-  };
-
-  estimateGas: {
-    tokenURI(
-      _tokenId: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    tokenByIndex(
-      _index: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    tokenOfOwnerByIndex(
-      _owner: PromiseOrValue<string>,
-      _index: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    transferFrom(
-      _from: PromiseOrValue<string>,
-      _to: PromiseOrValue<string>,
-      _tokenId: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<BigNumber>;
-
-    "safeTransferFrom(address,address,uint256)"(
-      _from: PromiseOrValue<string>,
-      _to: PromiseOrValue<string>,
-      _tokenId: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<BigNumber>;
-
-    "safeTransferFrom(address,address,uint256,bytes)"(
-      _from: PromiseOrValue<string>,
-      _to: PromiseOrValue<string>,
-      _tokenId: PromiseOrValue<BigNumberish>,
-      _data: PromiseOrValue<BytesLike>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<BigNumber>;
-
-    approve(
-      _approved: PromiseOrValue<string>,
-      _tokenId: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<BigNumber>;
-
-    setApprovalForAll(
-      _operator: PromiseOrValue<string>,
-      _approved: PromiseOrValue<boolean>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<BigNumber>;
-
-    mint(
-      _to: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<BigNumber>;
-
-    changeMinter(
-      _minter: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<BigNumber>;
-
-    changeURI(
-      _newURI: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<BigNumber>;
-
-    name(overrides?: CallOverrides): Promise<BigNumber>;
-
-    symbol(overrides?: CallOverrides): Promise<BigNumber>;
-
-    totalSupply(overrides?: CallOverrides): Promise<BigNumber>;
-
-    minter(overrides?: CallOverrides): Promise<BigNumber>;
-
-    socks(overrides?: CallOverrides): Promise<BigNumber>;
-
-    newURI(overrides?: CallOverrides): Promise<BigNumber>;
-
-    ownerOf(
-      arg0: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    balanceOf(
-      arg0: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    getApproved(
-      arg0: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    isApprovedForAll(
-      arg0: PromiseOrValue<string>,
-      arg1: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    supportsInterface(
-      arg0: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-  };
-
-  populateTransaction: {
-    tokenURI(
-      _tokenId: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    tokenByIndex(
-      _index: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    tokenOfOwnerByIndex(
-      _owner: PromiseOrValue<string>,
-      _index: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    transferFrom(
-      _from: PromiseOrValue<string>,
-      _to: PromiseOrValue<string>,
-      _tokenId: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<PopulatedTransaction>;
-
-    "safeTransferFrom(address,address,uint256)"(
-      _from: PromiseOrValue<string>,
-      _to: PromiseOrValue<string>,
-      _tokenId: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<PopulatedTransaction>;
-
-    "safeTransferFrom(address,address,uint256,bytes)"(
-      _from: PromiseOrValue<string>,
-      _to: PromiseOrValue<string>,
-      _tokenId: PromiseOrValue<BigNumberish>,
-      _data: PromiseOrValue<BytesLike>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<PopulatedTransaction>;
-
-    approve(
-      _approved: PromiseOrValue<string>,
-      _tokenId: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<PopulatedTransaction>;
-
-    setApprovalForAll(
-      _operator: PromiseOrValue<string>,
-      _approved: PromiseOrValue<boolean>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<PopulatedTransaction>;
-
-    mint(
-      _to: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<PopulatedTransaction>;
-
-    changeMinter(
-      _minter: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<PopulatedTransaction>;
-
-    changeURI(
-      _newURI: PromiseOrValue<string>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<PopulatedTransaction>;
-
-    name(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    symbol(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    totalSupply(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    minter(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    socks(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    newURI(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    ownerOf(
-      arg0: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    balanceOf(
-      arg0: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    getApproved(
-      arg0: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    isApprovedForAll(
-      arg0: PromiseOrValue<string>,
-      arg1: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    supportsInterface(
-      arg0: PromiseOrValue<BytesLike>,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-  };
-}
diff --git a/src/legacy/abis/types/Weth.d.ts b/src/legacy/abis/types/Weth.d.ts
deleted file mode 100644
index 30a97835f1..0000000000
--- a/src/legacy/abis/types/Weth.d.ts
+++ /dev/null
@@ -1,441 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-
-import {
-  ethers,
-  EventFilter,
-  Signer,
-  BigNumber,
-  BigNumberish,
-  PopulatedTransaction,
-  BaseContract,
-  ContractTransaction,
-  Overrides,
-  PayableOverrides,
-  CallOverrides,
-} from "ethers";
-import { BytesLike } from "@ethersproject/bytes";
-import { Listener, Provider } from "@ethersproject/providers";
-import { FunctionFragment, EventFragment, Result } from "@ethersproject/abi";
-import type { TypedEventFilter, TypedEvent, TypedListener } from "./common";
-
-interface WethInterface extends ethers.utils.Interface {
-  functions: {
-    "name()": FunctionFragment;
-    "approve(address,uint256)": FunctionFragment;
-    "totalSupply()": FunctionFragment;
-    "transferFrom(address,address,uint256)": FunctionFragment;
-    "withdraw(uint256)": FunctionFragment;
-    "decimals()": FunctionFragment;
-    "balanceOf(address)": FunctionFragment;
-    "symbol()": FunctionFragment;
-    "transfer(address,uint256)": FunctionFragment;
-    "deposit()": FunctionFragment;
-    "allowance(address,address)": FunctionFragment;
-  };
-
-  encodeFunctionData(functionFragment: "name", values?: undefined): string;
-  encodeFunctionData(
-    functionFragment: "approve",
-    values: [string, BigNumberish]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "totalSupply",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "transferFrom",
-    values: [string, string, BigNumberish]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "withdraw",
-    values: [BigNumberish]
-  ): string;
-  encodeFunctionData(functionFragment: "decimals", values?: undefined): string;
-  encodeFunctionData(functionFragment: "balanceOf", values: [string]): string;
-  encodeFunctionData(functionFragment: "symbol", values?: undefined): string;
-  encodeFunctionData(
-    functionFragment: "transfer",
-    values: [string, BigNumberish]
-  ): string;
-  encodeFunctionData(functionFragment: "deposit", values?: undefined): string;
-  encodeFunctionData(
-    functionFragment: "allowance",
-    values: [string, string]
-  ): string;
-
-  decodeFunctionResult(functionFragment: "name", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "approve", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "totalSupply",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "transferFrom",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "withdraw", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "decimals", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "balanceOf", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "symbol", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "transfer", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "deposit", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "allowance", data: BytesLike): Result;
-
-  events: {
-    "Approval(address,address,uint256)": EventFragment;
-    "Transfer(address,address,uint256)": EventFragment;
-    "Deposit(address,uint256)": EventFragment;
-    "Withdrawal(address,uint256)": EventFragment;
-  };
-
-  getEvent(nameOrSignatureOrTopic: "Approval"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "Transfer"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "Deposit"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "Withdrawal"): EventFragment;
-}
-
-export type ApprovalEvent = TypedEvent<
-  [string, string, BigNumber] & { src: string; guy: string; wad: BigNumber }
->;
-
-export type TransferEvent = TypedEvent<
-  [string, string, BigNumber] & { src: string; dst: string; wad: BigNumber }
->;
-
-export type DepositEvent = TypedEvent<
-  [string, BigNumber] & { dst: string; wad: BigNumber }
->;
-
-export type WithdrawalEvent = TypedEvent<
-  [string, BigNumber] & { src: string; wad: BigNumber }
->;
-
-export class Weth extends BaseContract {
-  connect(signerOrProvider: Signer | Provider | string): this;
-  attach(addressOrName: string): this;
-  deployed(): Promise<this>;
-
-  listeners<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter?: TypedEventFilter<EventArgsArray, EventArgsObject>
-  ): Array<TypedListener<EventArgsArray, EventArgsObject>>;
-  off<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    listener: TypedListener<EventArgsArray, EventArgsObject>
-  ): this;
-  on<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    listener: TypedListener<EventArgsArray, EventArgsObject>
-  ): this;
-  once<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    listener: TypedListener<EventArgsArray, EventArgsObject>
-  ): this;
-  removeListener<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    listener: TypedListener<EventArgsArray, EventArgsObject>
-  ): this;
-  removeAllListeners<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>
-  ): this;
-
-  listeners(eventName?: string): Array<Listener>;
-  off(eventName: string, listener: Listener): this;
-  on(eventName: string, listener: Listener): this;
-  once(eventName: string, listener: Listener): this;
-  removeListener(eventName: string, listener: Listener): this;
-  removeAllListeners(eventName?: string): this;
-
-  queryFilter<EventArgsArray extends Array<any>, EventArgsObject>(
-    event: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    fromBlockOrBlockhash?: string | number | undefined,
-    toBlock?: string | number | undefined
-  ): Promise<Array<TypedEvent<EventArgsArray & EventArgsObject>>>;
-
-  interface: WethInterface;
-
-  functions: {
-    name(overrides?: CallOverrides): Promise<[string]>;
-
-    approve(
-      guy: string,
-      wad: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    totalSupply(overrides?: CallOverrides): Promise<[BigNumber]>;
-
-    transferFrom(
-      src: string,
-      dst: string,
-      wad: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    withdraw(
-      wad: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    decimals(overrides?: CallOverrides): Promise<[number]>;
-
-    balanceOf(arg0: string, overrides?: CallOverrides): Promise<[BigNumber]>;
-
-    symbol(overrides?: CallOverrides): Promise<[string]>;
-
-    transfer(
-      dst: string,
-      wad: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    deposit(
-      overrides?: PayableOverrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    allowance(
-      arg0: string,
-      arg1: string,
-      overrides?: CallOverrides
-    ): Promise<[BigNumber]>;
-  };
-
-  name(overrides?: CallOverrides): Promise<string>;
-
-  approve(
-    guy: string,
-    wad: BigNumberish,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  totalSupply(overrides?: CallOverrides): Promise<BigNumber>;
-
-  transferFrom(
-    src: string,
-    dst: string,
-    wad: BigNumberish,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  withdraw(
-    wad: BigNumberish,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  decimals(overrides?: CallOverrides): Promise<number>;
-
-  balanceOf(arg0: string, overrides?: CallOverrides): Promise<BigNumber>;
-
-  symbol(overrides?: CallOverrides): Promise<string>;
-
-  transfer(
-    dst: string,
-    wad: BigNumberish,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  deposit(
-    overrides?: PayableOverrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  allowance(
-    arg0: string,
-    arg1: string,
-    overrides?: CallOverrides
-  ): Promise<BigNumber>;
-
-  callStatic: {
-    name(overrides?: CallOverrides): Promise<string>;
-
-    approve(
-      guy: string,
-      wad: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<boolean>;
-
-    totalSupply(overrides?: CallOverrides): Promise<BigNumber>;
-
-    transferFrom(
-      src: string,
-      dst: string,
-      wad: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<boolean>;
-
-    withdraw(wad: BigNumberish, overrides?: CallOverrides): Promise<void>;
-
-    decimals(overrides?: CallOverrides): Promise<number>;
-
-    balanceOf(arg0: string, overrides?: CallOverrides): Promise<BigNumber>;
-
-    symbol(overrides?: CallOverrides): Promise<string>;
-
-    transfer(
-      dst: string,
-      wad: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<boolean>;
-
-    deposit(overrides?: CallOverrides): Promise<void>;
-
-    allowance(
-      arg0: string,
-      arg1: string,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-  };
-
-  filters: {
-    "Approval(address,address,uint256)"(
-      src?: string | null,
-      guy?: string | null,
-      wad?: null
-    ): TypedEventFilter<
-      [string, string, BigNumber],
-      { src: string; guy: string; wad: BigNumber }
-    >;
-
-    Approval(
-      src?: string | null,
-      guy?: string | null,
-      wad?: null
-    ): TypedEventFilter<
-      [string, string, BigNumber],
-      { src: string; guy: string; wad: BigNumber }
-    >;
-
-    "Transfer(address,address,uint256)"(
-      src?: string | null,
-      dst?: string | null,
-      wad?: null
-    ): TypedEventFilter<
-      [string, string, BigNumber],
-      { src: string; dst: string; wad: BigNumber }
-    >;
-
-    Transfer(
-      src?: string | null,
-      dst?: string | null,
-      wad?: null
-    ): TypedEventFilter<
-      [string, string, BigNumber],
-      { src: string; dst: string; wad: BigNumber }
-    >;
-
-    "Deposit(address,uint256)"(
-      dst?: string | null,
-      wad?: null
-    ): TypedEventFilter<[string, BigNumber], { dst: string; wad: BigNumber }>;
-
-    Deposit(
-      dst?: string | null,
-      wad?: null
-    ): TypedEventFilter<[string, BigNumber], { dst: string; wad: BigNumber }>;
-
-    "Withdrawal(address,uint256)"(
-      src?: string | null,
-      wad?: null
-    ): TypedEventFilter<[string, BigNumber], { src: string; wad: BigNumber }>;
-
-    Withdrawal(
-      src?: string | null,
-      wad?: null
-    ): TypedEventFilter<[string, BigNumber], { src: string; wad: BigNumber }>;
-  };
-
-  estimateGas: {
-    name(overrides?: CallOverrides): Promise<BigNumber>;
-
-    approve(
-      guy: string,
-      wad: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    totalSupply(overrides?: CallOverrides): Promise<BigNumber>;
-
-    transferFrom(
-      src: string,
-      dst: string,
-      wad: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    withdraw(
-      wad: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    decimals(overrides?: CallOverrides): Promise<BigNumber>;
-
-    balanceOf(arg0: string, overrides?: CallOverrides): Promise<BigNumber>;
-
-    symbol(overrides?: CallOverrides): Promise<BigNumber>;
-
-    transfer(
-      dst: string,
-      wad: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    deposit(
-      overrides?: PayableOverrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    allowance(
-      arg0: string,
-      arg1: string,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-  };
-
-  populateTransaction: {
-    name(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    approve(
-      guy: string,
-      wad: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    totalSupply(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    transferFrom(
-      src: string,
-      dst: string,
-      wad: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    withdraw(
-      wad: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    decimals(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    balanceOf(
-      arg0: string,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    symbol(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    transfer(
-      dst: string,
-      wad: BigNumberish,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    deposit(
-      overrides?: PayableOverrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    allowance(
-      arg0: string,
-      arg1: string,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-  };
-}
diff --git a/src/legacy/abis/types/Weth.ts b/src/legacy/abis/types/Weth.ts
deleted file mode 100644
index 8c7eb29b0a..0000000000
--- a/src/legacy/abis/types/Weth.ts
+++ /dev/null
@@ -1,480 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-import type {
-  BaseContract,
-  BigNumber,
-  BigNumberish,
-  BytesLike,
-  CallOverrides,
-  ContractTransaction,
-  Overrides,
-  PayableOverrides,
-  PopulatedTransaction,
-  Signer,
-  utils,
-} from "ethers";
-import type {
-  FunctionFragment,
-  Result,
-  EventFragment,
-} from "@ethersproject/abi";
-import type { Listener, Provider } from "@ethersproject/providers";
-import type {
-  TypedEventFilter,
-  TypedEvent,
-  TypedListener,
-  OnEvent,
-  PromiseOrValue,
-} from "./common";
-
-export interface WethInterface extends utils.Interface {
-  functions: {
-    "name()": FunctionFragment;
-    "approve(address,uint256)": FunctionFragment;
-    "totalSupply()": FunctionFragment;
-    "transferFrom(address,address,uint256)": FunctionFragment;
-    "withdraw(uint256)": FunctionFragment;
-    "decimals()": FunctionFragment;
-    "balanceOf(address)": FunctionFragment;
-    "symbol()": FunctionFragment;
-    "transfer(address,uint256)": FunctionFragment;
-    "deposit()": FunctionFragment;
-    "allowance(address,address)": FunctionFragment;
-  };
-
-  getFunction(
-    nameOrSignatureOrTopic:
-      | "name"
-      | "approve"
-      | "totalSupply"
-      | "transferFrom"
-      | "withdraw"
-      | "decimals"
-      | "balanceOf"
-      | "symbol"
-      | "transfer"
-      | "deposit"
-      | "allowance"
-  ): FunctionFragment;
-
-  encodeFunctionData(functionFragment: "name", values?: undefined): string;
-  encodeFunctionData(
-    functionFragment: "approve",
-    values: [PromiseOrValue<string>, PromiseOrValue<BigNumberish>]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "totalSupply",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "transferFrom",
-    values: [
-      PromiseOrValue<string>,
-      PromiseOrValue<string>,
-      PromiseOrValue<BigNumberish>
-    ]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "withdraw",
-    values: [PromiseOrValue<BigNumberish>]
-  ): string;
-  encodeFunctionData(functionFragment: "decimals", values?: undefined): string;
-  encodeFunctionData(
-    functionFragment: "balanceOf",
-    values: [PromiseOrValue<string>]
-  ): string;
-  encodeFunctionData(functionFragment: "symbol", values?: undefined): string;
-  encodeFunctionData(
-    functionFragment: "transfer",
-    values: [PromiseOrValue<string>, PromiseOrValue<BigNumberish>]
-  ): string;
-  encodeFunctionData(functionFragment: "deposit", values?: undefined): string;
-  encodeFunctionData(
-    functionFragment: "allowance",
-    values: [PromiseOrValue<string>, PromiseOrValue<string>]
-  ): string;
-
-  decodeFunctionResult(functionFragment: "name", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "approve", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "totalSupply",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "transferFrom",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "withdraw", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "decimals", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "balanceOf", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "symbol", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "transfer", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "deposit", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "allowance", data: BytesLike): Result;
-
-  events: {
-    "Approval(address,address,uint256)": EventFragment;
-    "Transfer(address,address,uint256)": EventFragment;
-    "Deposit(address,uint256)": EventFragment;
-    "Withdrawal(address,uint256)": EventFragment;
-  };
-
-  getEvent(nameOrSignatureOrTopic: "Approval"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "Transfer"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "Deposit"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "Withdrawal"): EventFragment;
-}
-
-export interface ApprovalEventObject {
-  src: string;
-  guy: string;
-  wad: BigNumber;
-}
-export type ApprovalEvent = TypedEvent<
-  [string, string, BigNumber],
-  ApprovalEventObject
->;
-
-export type ApprovalEventFilter = TypedEventFilter<ApprovalEvent>;
-
-export interface TransferEventObject {
-  src: string;
-  dst: string;
-  wad: BigNumber;
-}
-export type TransferEvent = TypedEvent<
-  [string, string, BigNumber],
-  TransferEventObject
->;
-
-export type TransferEventFilter = TypedEventFilter<TransferEvent>;
-
-export interface DepositEventObject {
-  dst: string;
-  wad: BigNumber;
-}
-export type DepositEvent = TypedEvent<[string, BigNumber], DepositEventObject>;
-
-export type DepositEventFilter = TypedEventFilter<DepositEvent>;
-
-export interface WithdrawalEventObject {
-  src: string;
-  wad: BigNumber;
-}
-export type WithdrawalEvent = TypedEvent<
-  [string, BigNumber],
-  WithdrawalEventObject
->;
-
-export type WithdrawalEventFilter = TypedEventFilter<WithdrawalEvent>;
-
-export interface Weth extends BaseContract {
-  connect(signerOrProvider: Signer | Provider | string): this;
-  attach(addressOrName: string): this;
-  deployed(): Promise<this>;
-
-  interface: WethInterface;
-
-  queryFilter<TEvent extends TypedEvent>(
-    event: TypedEventFilter<TEvent>,
-    fromBlockOrBlockhash?: string | number | undefined,
-    toBlock?: string | number | undefined
-  ): Promise<Array<TEvent>>;
-
-  listeners<TEvent extends TypedEvent>(
-    eventFilter?: TypedEventFilter<TEvent>
-  ): Array<TypedListener<TEvent>>;
-  listeners(eventName?: string): Array<Listener>;
-  removeAllListeners<TEvent extends TypedEvent>(
-    eventFilter: TypedEventFilter<TEvent>
-  ): this;
-  removeAllListeners(eventName?: string): this;
-  off: OnEvent<this>;
-  on: OnEvent<this>;
-  once: OnEvent<this>;
-  removeListener: OnEvent<this>;
-
-  functions: {
-    name(overrides?: CallOverrides): Promise<[string]>;
-
-    approve(
-      guy: PromiseOrValue<string>,
-      wad: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<ContractTransaction>;
-
-    totalSupply(overrides?: CallOverrides): Promise<[BigNumber]>;
-
-    transferFrom(
-      src: PromiseOrValue<string>,
-      dst: PromiseOrValue<string>,
-      wad: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<ContractTransaction>;
-
-    withdraw(
-      wad: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<ContractTransaction>;
-
-    decimals(overrides?: CallOverrides): Promise<[number]>;
-
-    balanceOf(
-      arg0: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<[BigNumber]>;
-
-    symbol(overrides?: CallOverrides): Promise<[string]>;
-
-    transfer(
-      dst: PromiseOrValue<string>,
-      wad: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<ContractTransaction>;
-
-    deposit(
-      overrides?: PayableOverrides & { from?: PromiseOrValue<string> }
-    ): Promise<ContractTransaction>;
-
-    allowance(
-      arg0: PromiseOrValue<string>,
-      arg1: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<[BigNumber]>;
-  };
-
-  name(overrides?: CallOverrides): Promise<string>;
-
-  approve(
-    guy: PromiseOrValue<string>,
-    wad: PromiseOrValue<BigNumberish>,
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
-  ): Promise<ContractTransaction>;
-
-  totalSupply(overrides?: CallOverrides): Promise<BigNumber>;
-
-  transferFrom(
-    src: PromiseOrValue<string>,
-    dst: PromiseOrValue<string>,
-    wad: PromiseOrValue<BigNumberish>,
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
-  ): Promise<ContractTransaction>;
-
-  withdraw(
-    wad: PromiseOrValue<BigNumberish>,
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
-  ): Promise<ContractTransaction>;
-
-  decimals(overrides?: CallOverrides): Promise<number>;
-
-  balanceOf(
-    arg0: PromiseOrValue<string>,
-    overrides?: CallOverrides
-  ): Promise<BigNumber>;
-
-  symbol(overrides?: CallOverrides): Promise<string>;
-
-  transfer(
-    dst: PromiseOrValue<string>,
-    wad: PromiseOrValue<BigNumberish>,
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
-  ): Promise<ContractTransaction>;
-
-  deposit(
-    overrides?: PayableOverrides & { from?: PromiseOrValue<string> }
-  ): Promise<ContractTransaction>;
-
-  allowance(
-    arg0: PromiseOrValue<string>,
-    arg1: PromiseOrValue<string>,
-    overrides?: CallOverrides
-  ): Promise<BigNumber>;
-
-  callStatic: {
-    name(overrides?: CallOverrides): Promise<string>;
-
-    approve(
-      guy: PromiseOrValue<string>,
-      wad: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<boolean>;
-
-    totalSupply(overrides?: CallOverrides): Promise<BigNumber>;
-
-    transferFrom(
-      src: PromiseOrValue<string>,
-      dst: PromiseOrValue<string>,
-      wad: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<boolean>;
-
-    withdraw(
-      wad: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    decimals(overrides?: CallOverrides): Promise<number>;
-
-    balanceOf(
-      arg0: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    symbol(overrides?: CallOverrides): Promise<string>;
-
-    transfer(
-      dst: PromiseOrValue<string>,
-      wad: PromiseOrValue<BigNumberish>,
-      overrides?: CallOverrides
-    ): Promise<boolean>;
-
-    deposit(overrides?: CallOverrides): Promise<void>;
-
-    allowance(
-      arg0: PromiseOrValue<string>,
-      arg1: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-  };
-
-  filters: {
-    "Approval(address,address,uint256)"(
-      src?: PromiseOrValue<string> | null,
-      guy?: PromiseOrValue<string> | null,
-      wad?: null
-    ): ApprovalEventFilter;
-    Approval(
-      src?: PromiseOrValue<string> | null,
-      guy?: PromiseOrValue<string> | null,
-      wad?: null
-    ): ApprovalEventFilter;
-
-    "Transfer(address,address,uint256)"(
-      src?: PromiseOrValue<string> | null,
-      dst?: PromiseOrValue<string> | null,
-      wad?: null
-    ): TransferEventFilter;
-    Transfer(
-      src?: PromiseOrValue<string> | null,
-      dst?: PromiseOrValue<string> | null,
-      wad?: null
-    ): TransferEventFilter;
-
-    "Deposit(address,uint256)"(
-      dst?: PromiseOrValue<string> | null,
-      wad?: null
-    ): DepositEventFilter;
-    Deposit(
-      dst?: PromiseOrValue<string> | null,
-      wad?: null
-    ): DepositEventFilter;
-
-    "Withdrawal(address,uint256)"(
-      src?: PromiseOrValue<string> | null,
-      wad?: null
-    ): WithdrawalEventFilter;
-    Withdrawal(
-      src?: PromiseOrValue<string> | null,
-      wad?: null
-    ): WithdrawalEventFilter;
-  };
-
-  estimateGas: {
-    name(overrides?: CallOverrides): Promise<BigNumber>;
-
-    approve(
-      guy: PromiseOrValue<string>,
-      wad: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<BigNumber>;
-
-    totalSupply(overrides?: CallOverrides): Promise<BigNumber>;
-
-    transferFrom(
-      src: PromiseOrValue<string>,
-      dst: PromiseOrValue<string>,
-      wad: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<BigNumber>;
-
-    withdraw(
-      wad: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<BigNumber>;
-
-    decimals(overrides?: CallOverrides): Promise<BigNumber>;
-
-    balanceOf(
-      arg0: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    symbol(overrides?: CallOverrides): Promise<BigNumber>;
-
-    transfer(
-      dst: PromiseOrValue<string>,
-      wad: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<BigNumber>;
-
-    deposit(
-      overrides?: PayableOverrides & { from?: PromiseOrValue<string> }
-    ): Promise<BigNumber>;
-
-    allowance(
-      arg0: PromiseOrValue<string>,
-      arg1: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-  };
-
-  populateTransaction: {
-    name(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    approve(
-      guy: PromiseOrValue<string>,
-      wad: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<PopulatedTransaction>;
-
-    totalSupply(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    transferFrom(
-      src: PromiseOrValue<string>,
-      dst: PromiseOrValue<string>,
-      wad: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<PopulatedTransaction>;
-
-    withdraw(
-      wad: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<PopulatedTransaction>;
-
-    decimals(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    balanceOf(
-      arg0: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    symbol(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    transfer(
-      dst: PromiseOrValue<string>,
-      wad: PromiseOrValue<BigNumberish>,
-      overrides?: Overrides & { from?: PromiseOrValue<string> }
-    ): Promise<PopulatedTransaction>;
-
-    deposit(
-      overrides?: PayableOverrides & { from?: PromiseOrValue<string> }
-    ): Promise<PopulatedTransaction>;
-
-    allowance(
-      arg0: PromiseOrValue<string>,
-      arg1: PromiseOrValue<string>,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-  };
-}
diff --git a/src/legacy/abis/types/common.d.ts b/src/legacy/abis/types/common.d.ts
deleted file mode 100644
index fc937825df..0000000000
--- a/src/legacy/abis/types/common.d.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-import { EventFilter, Event } from "ethers";
-import { Result } from "@ethersproject/abi";
-
-export interface TypedEventFilter<_EventArgsArray, _EventArgsObject>
-  extends EventFilter {}
-
-export interface TypedEvent<EventArgs extends Result> extends Event {
-  args: EventArgs;
-}
-
-export type TypedListener<
-  EventArgsArray extends Array<any>,
-  EventArgsObject
-> = (
-  ...listenerArg: [
-    ...EventArgsArray,
-    TypedEvent<EventArgsArray & EventArgsObject>
-  ]
-) => void;
-
-export type MinEthersFactory<C, ARGS> = {
-  deploy(...a: ARGS[]): Promise<C>;
-};
-export type GetContractTypeFromFactory<F> = F extends MinEthersFactory<
-  infer C,
-  any
->
-  ? C
-  : never;
-export type GetARGsTypeFromFactory<F> = F extends MinEthersFactory<any, any>
-  ? Parameters<F["deploy"]>
-  : never;
diff --git a/src/legacy/abis/types/common.ts b/src/legacy/abis/types/common.ts
deleted file mode 100644
index 4c90b08bb4..0000000000
--- a/src/legacy/abis/types/common.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-import type { Listener } from "@ethersproject/providers";
-import type { Event, EventFilter } from "ethers";
-
-export interface TypedEvent<
-  TArgsArray extends Array<any> = any,
-  TArgsObject = any
-> extends Event {
-  args: TArgsArray & TArgsObject;
-}
-
-export interface TypedEventFilter<_TEvent extends TypedEvent>
-  extends EventFilter {}
-
-export interface TypedListener<TEvent extends TypedEvent> {
-  (...listenerArg: [...__TypechainArgsArray<TEvent>, TEvent]): void;
-}
-
-type __TypechainArgsArray<T> = T extends TypedEvent<infer U> ? U : never;
-
-export interface OnEvent<TRes> {
-  <TEvent extends TypedEvent>(
-    eventFilter: TypedEventFilter<TEvent>,
-    listener: TypedListener<TEvent>
-  ): TRes;
-  (eventName: string, listener: Listener): TRes;
-}
-
-export type MinEthersFactory<C, ARGS> = {
-  deploy(...a: ARGS[]): Promise<C>;
-};
-
-export type GetContractTypeFromFactory<F> = F extends MinEthersFactory<
-  infer C,
-  any
->
-  ? C
-  : never;
-
-export type GetARGsTypeFromFactory<F> = F extends MinEthersFactory<any, any>
-  ? Parameters<F["deploy"]>
-  : never;
-
-export type PromiseOrValue<T> = T | Promise<T>;
diff --git a/src/legacy/abis/types/factories/ArgentWalletContract__factory.ts b/src/legacy/abis/types/factories/ArgentWalletContract__factory.ts
deleted file mode 100644
index 1ca404877a..0000000000
--- a/src/legacy/abis/types/factories/ArgentWalletContract__factory.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-
-import { Contract, Signer, utils } from "ethers";
-import type { Provider } from "@ethersproject/providers";
-import type {
-  ArgentWalletContract,
-  ArgentWalletContractInterface,
-} from "../ArgentWalletContract";
-
-const _abi = [
-  {
-    inputs: [
-      {
-        components: [
-          {
-            internalType: "address",
-            name: "to",
-            type: "address",
-          },
-          {
-            internalType: "uint256",
-            name: "value",
-            type: "uint256",
-          },
-          {
-            internalType: "bytes",
-            name: "data",
-            type: "bytes",
-          },
-        ],
-        name: "_transactions",
-        type: "tuple[]",
-      },
-    ],
-    name: "wc_multiCall",
-    outputs: [
-      {
-        internalType: "bytes[]",
-        name: "",
-        type: "bytes[]",
-      },
-    ],
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        internalType: "bytes32",
-        name: "_msgHash",
-        type: "bytes32",
-      },
-      {
-        internalType: "bytes",
-        name: "_signature",
-        type: "bytes",
-      },
-    ],
-    name: "isValidSignature",
-    outputs: [
-      {
-        internalType: "bytes4",
-        name: "",
-        type: "bytes4",
-      },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-] as const;
-
-export class ArgentWalletContract__factory {
-  static readonly abi = _abi;
-  static createInterface(): ArgentWalletContractInterface {
-    return new utils.Interface(_abi) as ArgentWalletContractInterface;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): ArgentWalletContract {
-    return new Contract(
-      address,
-      _abi,
-      signerOrProvider
-    ) as ArgentWalletContract;
-  }
-}
diff --git a/src/legacy/abis/types/factories/ArgentWalletDetector__factory.ts b/src/legacy/abis/types/factories/ArgentWalletDetector__factory.ts
deleted file mode 100644
index 7d504907fd..0000000000
--- a/src/legacy/abis/types/factories/ArgentWalletDetector__factory.ts
+++ /dev/null
@@ -1,243 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-
-import { Contract, Signer, utils } from "ethers";
-import type { Provider } from "@ethersproject/providers";
-import type {
-  ArgentWalletDetector,
-  ArgentWalletDetectorInterface,
-} from "../ArgentWalletDetector";
-
-const _abi = [
-  {
-    inputs: [
-      {
-        internalType: "bytes32[]",
-        name: "_codes",
-        type: "bytes32[]",
-      },
-      {
-        internalType: "address[]",
-        name: "_implementations",
-        type: "address[]",
-      },
-    ],
-    stateMutability: "nonpayable",
-    type: "constructor",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "bytes32",
-        name: "code",
-        type: "bytes32",
-      },
-    ],
-    name: "CodeAdded",
-    type: "event",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "address",
-        name: "implementation",
-        type: "address",
-      },
-    ],
-    name: "ImplementationAdded",
-    type: "event",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "address",
-        name: "_newOwner",
-        type: "address",
-      },
-    ],
-    name: "OwnerChanged",
-    type: "event",
-  },
-  {
-    inputs: [
-      {
-        internalType: "bytes32",
-        name: "",
-        type: "bytes32",
-      },
-    ],
-    name: "acceptedCodes",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "exists",
-        type: "bool",
-      },
-      {
-        internalType: "uint128",
-        name: "index",
-        type: "uint128",
-      },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "",
-        type: "address",
-      },
-    ],
-    name: "acceptedImplementations",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "exists",
-        type: "bool",
-      },
-      {
-        internalType: "uint128",
-        name: "index",
-        type: "uint128",
-      },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        internalType: "bytes32",
-        name: "_code",
-        type: "bytes32",
-      },
-    ],
-    name: "addCode",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_argentWallet",
-        type: "address",
-      },
-    ],
-    name: "addCodeAndImplementationFromWallet",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_impl",
-        type: "address",
-      },
-    ],
-    name: "addImplementation",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_newOwner",
-        type: "address",
-      },
-    ],
-    name: "changeOwner",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    inputs: [],
-    name: "getCodes",
-    outputs: [
-      {
-        internalType: "bytes32[]",
-        name: "",
-        type: "bytes32[]",
-      },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [],
-    name: "getImplementations",
-    outputs: [
-      {
-        internalType: "address[]",
-        name: "",
-        type: "address[]",
-      },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_wallet",
-        type: "address",
-      },
-    ],
-    name: "isArgentWallet",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool",
-      },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [],
-    name: "owner",
-    outputs: [
-      {
-        internalType: "address",
-        name: "",
-        type: "address",
-      },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-] as const;
-
-export class ArgentWalletDetector__factory {
-  static readonly abi = _abi;
-  static createInterface(): ArgentWalletDetectorInterface {
-    return new utils.Interface(_abi) as ArgentWalletDetectorInterface;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): ArgentWalletDetector {
-    return new Contract(
-      address,
-      _abi,
-      signerOrProvider
-    ) as ArgentWalletDetector;
-  }
-}
diff --git a/src/legacy/abis/types/factories/Eip2612__factory.ts b/src/legacy/abis/types/factories/Eip2612__factory.ts
deleted file mode 100644
index c03f331f11..0000000000
--- a/src/legacy/abis/types/factories/Eip2612__factory.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-
-import { Contract, Signer, utils } from "ethers";
-import { Provider } from "@ethersproject/providers";
-import type { Eip2612, Eip2612Interface } from "../Eip2612";
-
-const _abi = [
-  {
-    constant: true,
-    inputs: [
-      {
-        name: "owner",
-        type: "address",
-      },
-    ],
-    name: "nonces",
-    outputs: [
-      {
-        name: "",
-        type: "uint256",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: "DOMAIN_SEPARATOR",
-    outputs: [
-      {
-        name: "",
-        type: "bytes32",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-];
-
-export class Eip2612__factory {
-  static readonly abi = _abi;
-  static createInterface(): Eip2612Interface {
-    return new utils.Interface(_abi) as Eip2612Interface;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): Eip2612 {
-    return new Contract(address, _abi, signerOrProvider) as Eip2612;
-  }
-}
diff --git a/src/legacy/abis/types/factories/Eip_2612__factory.ts b/src/legacy/abis/types/factories/Eip_2612__factory.ts
deleted file mode 100644
index 493e1ca866..0000000000
--- a/src/legacy/abis/types/factories/Eip_2612__factory.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-
-import { Contract, Signer, utils } from "ethers";
-import type { Provider } from "@ethersproject/providers";
-import type { Eip_2612, Eip_2612Interface } from "../Eip_2612";
-
-const _abi = [
-  {
-    constant: true,
-    inputs: [
-      {
-        name: "owner",
-        type: "address",
-      },
-    ],
-    name: "nonces",
-    outputs: [
-      {
-        name: "",
-        type: "uint256",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: "DOMAIN_SEPARATOR",
-    outputs: [
-      {
-        name: "",
-        type: "bytes32",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-] as const;
-
-export class Eip_2612__factory {
-  static readonly abi = _abi;
-  static createInterface(): Eip_2612Interface {
-    return new utils.Interface(_abi) as Eip_2612Interface;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): Eip_2612 {
-    return new Contract(address, _abi, signerOrProvider) as Eip_2612;
-  }
-}
diff --git a/src/legacy/abis/types/factories/EnsPublicResolver__factory.ts b/src/legacy/abis/types/factories/EnsPublicResolver__factory.ts
deleted file mode 100644
index 574b66ec92..0000000000
--- a/src/legacy/abis/types/factories/EnsPublicResolver__factory.ts
+++ /dev/null
@@ -1,840 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-
-import { Contract, Signer, utils } from "ethers";
-import type { Provider } from "@ethersproject/providers";
-import type {
-  EnsPublicResolver,
-  EnsPublicResolverInterface,
-} from "../EnsPublicResolver";
-
-const _abi = [
-  {
-    inputs: [
-      {
-        internalType: "contract ENS",
-        name: "_ens",
-        type: "address",
-      },
-    ],
-    payable: false,
-    stateMutability: "nonpayable",
-    type: "constructor",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "bytes32",
-        name: "node",
-        type: "bytes32",
-      },
-      {
-        indexed: true,
-        internalType: "uint256",
-        name: "contentType",
-        type: "uint256",
-      },
-    ],
-    name: "ABIChanged",
-    type: "event",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "bytes32",
-        name: "node",
-        type: "bytes32",
-      },
-      {
-        indexed: false,
-        internalType: "address",
-        name: "a",
-        type: "address",
-      },
-    ],
-    name: "AddrChanged",
-    type: "event",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "bytes32",
-        name: "node",
-        type: "bytes32",
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "coinType",
-        type: "uint256",
-      },
-      {
-        indexed: false,
-        internalType: "bytes",
-        name: "newAddress",
-        type: "bytes",
-      },
-    ],
-    name: "AddressChanged",
-    type: "event",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "bytes32",
-        name: "node",
-        type: "bytes32",
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "owner",
-        type: "address",
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "target",
-        type: "address",
-      },
-      {
-        indexed: false,
-        internalType: "bool",
-        name: "isAuthorised",
-        type: "bool",
-      },
-    ],
-    name: "AuthorisationChanged",
-    type: "event",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "bytes32",
-        name: "node",
-        type: "bytes32",
-      },
-      {
-        indexed: false,
-        internalType: "bytes",
-        name: "hash",
-        type: "bytes",
-      },
-    ],
-    name: "ContenthashChanged",
-    type: "event",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "bytes32",
-        name: "node",
-        type: "bytes32",
-      },
-      {
-        indexed: false,
-        internalType: "bytes",
-        name: "name",
-        type: "bytes",
-      },
-      {
-        indexed: false,
-        internalType: "uint16",
-        name: "resource",
-        type: "uint16",
-      },
-      {
-        indexed: false,
-        internalType: "bytes",
-        name: "record",
-        type: "bytes",
-      },
-    ],
-    name: "DNSRecordChanged",
-    type: "event",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "bytes32",
-        name: "node",
-        type: "bytes32",
-      },
-      {
-        indexed: false,
-        internalType: "bytes",
-        name: "name",
-        type: "bytes",
-      },
-      {
-        indexed: false,
-        internalType: "uint16",
-        name: "resource",
-        type: "uint16",
-      },
-    ],
-    name: "DNSRecordDeleted",
-    type: "event",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "bytes32",
-        name: "node",
-        type: "bytes32",
-      },
-    ],
-    name: "DNSZoneCleared",
-    type: "event",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "bytes32",
-        name: "node",
-        type: "bytes32",
-      },
-      {
-        indexed: true,
-        internalType: "bytes4",
-        name: "interfaceID",
-        type: "bytes4",
-      },
-      {
-        indexed: false,
-        internalType: "address",
-        name: "implementer",
-        type: "address",
-      },
-    ],
-    name: "InterfaceChanged",
-    type: "event",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "bytes32",
-        name: "node",
-        type: "bytes32",
-      },
-      {
-        indexed: false,
-        internalType: "string",
-        name: "name",
-        type: "string",
-      },
-    ],
-    name: "NameChanged",
-    type: "event",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "bytes32",
-        name: "node",
-        type: "bytes32",
-      },
-      {
-        indexed: false,
-        internalType: "bytes32",
-        name: "x",
-        type: "bytes32",
-      },
-      {
-        indexed: false,
-        internalType: "bytes32",
-        name: "y",
-        type: "bytes32",
-      },
-    ],
-    name: "PubkeyChanged",
-    type: "event",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "bytes32",
-        name: "node",
-        type: "bytes32",
-      },
-      {
-        indexed: true,
-        internalType: "string",
-        name: "indexedKey",
-        type: "string",
-      },
-      {
-        indexed: false,
-        internalType: "string",
-        name: "key",
-        type: "string",
-      },
-    ],
-    name: "TextChanged",
-    type: "event",
-  },
-  {
-    constant: true,
-    inputs: [
-      {
-        internalType: "bytes32",
-        name: "node",
-        type: "bytes32",
-      },
-      {
-        internalType: "uint256",
-        name: "contentTypes",
-        type: "uint256",
-      },
-    ],
-    name: "ABI",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256",
-      },
-      {
-        internalType: "bytes",
-        name: "",
-        type: "bytes",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [
-      {
-        internalType: "bytes32",
-        name: "node",
-        type: "bytes32",
-      },
-    ],
-    name: "addr",
-    outputs: [
-      {
-        internalType: "address payable",
-        name: "",
-        type: "address",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [
-      {
-        internalType: "bytes32",
-        name: "",
-        type: "bytes32",
-      },
-      {
-        internalType: "address",
-        name: "",
-        type: "address",
-      },
-      {
-        internalType: "address",
-        name: "",
-        type: "address",
-      },
-    ],
-    name: "authorisations",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: false,
-    inputs: [
-      {
-        internalType: "bytes32",
-        name: "node",
-        type: "bytes32",
-      },
-    ],
-    name: "clearDNSZone",
-    outputs: [],
-    payable: false,
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [
-      {
-        internalType: "bytes32",
-        name: "node",
-        type: "bytes32",
-      },
-    ],
-    name: "contenthash",
-    outputs: [
-      {
-        internalType: "bytes",
-        name: "",
-        type: "bytes",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [
-      {
-        internalType: "bytes32",
-        name: "node",
-        type: "bytes32",
-      },
-      {
-        internalType: "bytes32",
-        name: "name",
-        type: "bytes32",
-      },
-      {
-        internalType: "uint16",
-        name: "resource",
-        type: "uint16",
-      },
-    ],
-    name: "dnsRecord",
-    outputs: [
-      {
-        internalType: "bytes",
-        name: "",
-        type: "bytes",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [
-      {
-        internalType: "bytes32",
-        name: "node",
-        type: "bytes32",
-      },
-      {
-        internalType: "bytes32",
-        name: "name",
-        type: "bytes32",
-      },
-    ],
-    name: "hasDNSRecords",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [
-      {
-        internalType: "bytes32",
-        name: "node",
-        type: "bytes32",
-      },
-      {
-        internalType: "bytes4",
-        name: "interfaceID",
-        type: "bytes4",
-      },
-    ],
-    name: "interfaceImplementer",
-    outputs: [
-      {
-        internalType: "address",
-        name: "",
-        type: "address",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [
-      {
-        internalType: "bytes32",
-        name: "node",
-        type: "bytes32",
-      },
-    ],
-    name: "name",
-    outputs: [
-      {
-        internalType: "string",
-        name: "",
-        type: "string",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [
-      {
-        internalType: "bytes32",
-        name: "node",
-        type: "bytes32",
-      },
-    ],
-    name: "pubkey",
-    outputs: [
-      {
-        internalType: "bytes32",
-        name: "x",
-        type: "bytes32",
-      },
-      {
-        internalType: "bytes32",
-        name: "y",
-        type: "bytes32",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: false,
-    inputs: [
-      {
-        internalType: "bytes32",
-        name: "node",
-        type: "bytes32",
-      },
-      {
-        internalType: "uint256",
-        name: "contentType",
-        type: "uint256",
-      },
-      {
-        internalType: "bytes",
-        name: "data",
-        type: "bytes",
-      },
-    ],
-    name: "setABI",
-    outputs: [],
-    payable: false,
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    constant: false,
-    inputs: [
-      {
-        internalType: "bytes32",
-        name: "node",
-        type: "bytes32",
-      },
-      {
-        internalType: "uint256",
-        name: "coinType",
-        type: "uint256",
-      },
-      {
-        internalType: "bytes",
-        name: "a",
-        type: "bytes",
-      },
-    ],
-    name: "setAddr",
-    outputs: [],
-    payable: false,
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    constant: false,
-    inputs: [
-      {
-        internalType: "bytes32",
-        name: "node",
-        type: "bytes32",
-      },
-      {
-        internalType: "address",
-        name: "a",
-        type: "address",
-      },
-    ],
-    name: "setAddr",
-    outputs: [],
-    payable: false,
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    constant: false,
-    inputs: [
-      {
-        internalType: "bytes32",
-        name: "node",
-        type: "bytes32",
-      },
-      {
-        internalType: "address",
-        name: "target",
-        type: "address",
-      },
-      {
-        internalType: "bool",
-        name: "isAuthorised",
-        type: "bool",
-      },
-    ],
-    name: "setAuthorisation",
-    outputs: [],
-    payable: false,
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    constant: false,
-    inputs: [
-      {
-        internalType: "bytes32",
-        name: "node",
-        type: "bytes32",
-      },
-      {
-        internalType: "bytes",
-        name: "hash",
-        type: "bytes",
-      },
-    ],
-    name: "setContenthash",
-    outputs: [],
-    payable: false,
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    constant: false,
-    inputs: [
-      {
-        internalType: "bytes32",
-        name: "node",
-        type: "bytes32",
-      },
-      {
-        internalType: "bytes",
-        name: "data",
-        type: "bytes",
-      },
-    ],
-    name: "setDNSRecords",
-    outputs: [],
-    payable: false,
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    constant: false,
-    inputs: [
-      {
-        internalType: "bytes32",
-        name: "node",
-        type: "bytes32",
-      },
-      {
-        internalType: "bytes4",
-        name: "interfaceID",
-        type: "bytes4",
-      },
-      {
-        internalType: "address",
-        name: "implementer",
-        type: "address",
-      },
-    ],
-    name: "setInterface",
-    outputs: [],
-    payable: false,
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    constant: false,
-    inputs: [
-      {
-        internalType: "bytes32",
-        name: "node",
-        type: "bytes32",
-      },
-      {
-        internalType: "string",
-        name: "name",
-        type: "string",
-      },
-    ],
-    name: "setName",
-    outputs: [],
-    payable: false,
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    constant: false,
-    inputs: [
-      {
-        internalType: "bytes32",
-        name: "node",
-        type: "bytes32",
-      },
-      {
-        internalType: "bytes32",
-        name: "x",
-        type: "bytes32",
-      },
-      {
-        internalType: "bytes32",
-        name: "y",
-        type: "bytes32",
-      },
-    ],
-    name: "setPubkey",
-    outputs: [],
-    payable: false,
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    constant: false,
-    inputs: [
-      {
-        internalType: "bytes32",
-        name: "node",
-        type: "bytes32",
-      },
-      {
-        internalType: "string",
-        name: "key",
-        type: "string",
-      },
-      {
-        internalType: "string",
-        name: "value",
-        type: "string",
-      },
-    ],
-    name: "setText",
-    outputs: [],
-    payable: false,
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [
-      {
-        internalType: "bytes4",
-        name: "interfaceID",
-        type: "bytes4",
-      },
-    ],
-    name: "supportsInterface",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool",
-      },
-    ],
-    payable: false,
-    stateMutability: "pure",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [
-      {
-        internalType: "bytes32",
-        name: "node",
-        type: "bytes32",
-      },
-      {
-        internalType: "string",
-        name: "key",
-        type: "string",
-      },
-    ],
-    name: "text",
-    outputs: [
-      {
-        internalType: "string",
-        name: "",
-        type: "string",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-] as const;
-
-export class EnsPublicResolver__factory {
-  static readonly abi = _abi;
-  static createInterface(): EnsPublicResolverInterface {
-    return new utils.Interface(_abi) as EnsPublicResolverInterface;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): EnsPublicResolver {
-    return new Contract(address, _abi, signerOrProvider) as EnsPublicResolver;
-  }
-}
diff --git a/src/legacy/abis/types/factories/EnsRegistrar__factory.ts b/src/legacy/abis/types/factories/EnsRegistrar__factory.ts
deleted file mode 100644
index c43ae5c3dc..0000000000
--- a/src/legacy/abis/types/factories/EnsRegistrar__factory.ts
+++ /dev/null
@@ -1,443 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-
-import { Contract, Signer, utils } from "ethers";
-import type { Provider } from "@ethersproject/providers";
-import type { EnsRegistrar, EnsRegistrarInterface } from "../EnsRegistrar";
-
-const _abi = [
-  {
-    inputs: [
-      {
-        internalType: "contract ENS",
-        name: "_old",
-        type: "address",
-      },
-    ],
-    payable: false,
-    stateMutability: "nonpayable",
-    type: "constructor",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "address",
-        name: "owner",
-        type: "address",
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "operator",
-        type: "address",
-      },
-      {
-        indexed: false,
-        internalType: "bool",
-        name: "approved",
-        type: "bool",
-      },
-    ],
-    name: "ApprovalForAll",
-    type: "event",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "bytes32",
-        name: "node",
-        type: "bytes32",
-      },
-      {
-        indexed: true,
-        internalType: "bytes32",
-        name: "label",
-        type: "bytes32",
-      },
-      {
-        indexed: false,
-        internalType: "address",
-        name: "owner",
-        type: "address",
-      },
-    ],
-    name: "NewOwner",
-    type: "event",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "bytes32",
-        name: "node",
-        type: "bytes32",
-      },
-      {
-        indexed: false,
-        internalType: "address",
-        name: "resolver",
-        type: "address",
-      },
-    ],
-    name: "NewResolver",
-    type: "event",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "bytes32",
-        name: "node",
-        type: "bytes32",
-      },
-      {
-        indexed: false,
-        internalType: "uint64",
-        name: "ttl",
-        type: "uint64",
-      },
-    ],
-    name: "NewTTL",
-    type: "event",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "bytes32",
-        name: "node",
-        type: "bytes32",
-      },
-      {
-        indexed: false,
-        internalType: "address",
-        name: "owner",
-        type: "address",
-      },
-    ],
-    name: "Transfer",
-    type: "event",
-  },
-  {
-    constant: true,
-    inputs: [
-      {
-        internalType: "address",
-        name: "owner",
-        type: "address",
-      },
-      {
-        internalType: "address",
-        name: "operator",
-        type: "address",
-      },
-    ],
-    name: "isApprovedForAll",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: "old",
-    outputs: [
-      {
-        internalType: "contract ENS",
-        name: "",
-        type: "address",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [
-      {
-        internalType: "bytes32",
-        name: "node",
-        type: "bytes32",
-      },
-    ],
-    name: "owner",
-    outputs: [
-      {
-        internalType: "address",
-        name: "",
-        type: "address",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [
-      {
-        internalType: "bytes32",
-        name: "node",
-        type: "bytes32",
-      },
-    ],
-    name: "recordExists",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [
-      {
-        internalType: "bytes32",
-        name: "node",
-        type: "bytes32",
-      },
-    ],
-    name: "resolver",
-    outputs: [
-      {
-        internalType: "address",
-        name: "",
-        type: "address",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: false,
-    inputs: [
-      {
-        internalType: "address",
-        name: "operator",
-        type: "address",
-      },
-      {
-        internalType: "bool",
-        name: "approved",
-        type: "bool",
-      },
-    ],
-    name: "setApprovalForAll",
-    outputs: [],
-    payable: false,
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    constant: false,
-    inputs: [
-      {
-        internalType: "bytes32",
-        name: "node",
-        type: "bytes32",
-      },
-      {
-        internalType: "address",
-        name: "owner",
-        type: "address",
-      },
-    ],
-    name: "setOwner",
-    outputs: [],
-    payable: false,
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    constant: false,
-    inputs: [
-      {
-        internalType: "bytes32",
-        name: "node",
-        type: "bytes32",
-      },
-      {
-        internalType: "address",
-        name: "owner",
-        type: "address",
-      },
-      {
-        internalType: "address",
-        name: "resolver",
-        type: "address",
-      },
-      {
-        internalType: "uint64",
-        name: "ttl",
-        type: "uint64",
-      },
-    ],
-    name: "setRecord",
-    outputs: [],
-    payable: false,
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    constant: false,
-    inputs: [
-      {
-        internalType: "bytes32",
-        name: "node",
-        type: "bytes32",
-      },
-      {
-        internalType: "address",
-        name: "resolver",
-        type: "address",
-      },
-    ],
-    name: "setResolver",
-    outputs: [],
-    payable: false,
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    constant: false,
-    inputs: [
-      {
-        internalType: "bytes32",
-        name: "node",
-        type: "bytes32",
-      },
-      {
-        internalType: "bytes32",
-        name: "label",
-        type: "bytes32",
-      },
-      {
-        internalType: "address",
-        name: "owner",
-        type: "address",
-      },
-    ],
-    name: "setSubnodeOwner",
-    outputs: [
-      {
-        internalType: "bytes32",
-        name: "",
-        type: "bytes32",
-      },
-    ],
-    payable: false,
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    constant: false,
-    inputs: [
-      {
-        internalType: "bytes32",
-        name: "node",
-        type: "bytes32",
-      },
-      {
-        internalType: "bytes32",
-        name: "label",
-        type: "bytes32",
-      },
-      {
-        internalType: "address",
-        name: "owner",
-        type: "address",
-      },
-      {
-        internalType: "address",
-        name: "resolver",
-        type: "address",
-      },
-      {
-        internalType: "uint64",
-        name: "ttl",
-        type: "uint64",
-      },
-    ],
-    name: "setSubnodeRecord",
-    outputs: [],
-    payable: false,
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    constant: false,
-    inputs: [
-      {
-        internalType: "bytes32",
-        name: "node",
-        type: "bytes32",
-      },
-      {
-        internalType: "uint64",
-        name: "ttl",
-        type: "uint64",
-      },
-    ],
-    name: "setTTL",
-    outputs: [],
-    payable: false,
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [
-      {
-        internalType: "bytes32",
-        name: "node",
-        type: "bytes32",
-      },
-    ],
-    name: "ttl",
-    outputs: [
-      {
-        internalType: "uint64",
-        name: "",
-        type: "uint64",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-] as const;
-
-export class EnsRegistrar__factory {
-  static readonly abi = _abi;
-  static createInterface(): EnsRegistrarInterface {
-    return new utils.Interface(_abi) as EnsRegistrarInterface;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): EnsRegistrar {
-    return new Contract(address, _abi, signerOrProvider) as EnsRegistrar;
-  }
-}
diff --git a/src/legacy/abis/types/factories/Erc1155__factory.ts b/src/legacy/abis/types/factories/Erc1155__factory.ts
deleted file mode 100644
index 726e555135..0000000000
--- a/src/legacy/abis/types/factories/Erc1155__factory.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-
-import { Contract, Signer, utils } from "ethers";
-import type { Provider } from "@ethersproject/providers";
-import type { Erc1155, Erc1155Interface } from "../Erc1155";
-
-const _abi = [
-  {
-    constant: true,
-    inputs: [
-      {
-        internalType: "address",
-        name: "_owner",
-        type: "address",
-      },
-      {
-        internalType: "uint256",
-        name: "_id",
-        type: "uint256",
-      },
-    ],
-    name: "balanceOf",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [
-      {
-        internalType: "uint256",
-        name: "_id",
-        type: "uint256",
-      },
-    ],
-    name: "uri",
-    outputs: [
-      {
-        internalType: "string",
-        name: "",
-        type: "string",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-] as const;
-
-export class Erc1155__factory {
-  static readonly abi = _abi;
-  static createInterface(): Erc1155Interface {
-    return new utils.Interface(_abi) as Erc1155Interface;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): Erc1155 {
-    return new Contract(address, _abi, signerOrProvider) as Erc1155;
-  }
-}
diff --git a/src/legacy/abis/types/factories/Erc20Bytes32__factory.ts b/src/legacy/abis/types/factories/Erc20Bytes32__factory.ts
deleted file mode 100644
index b8f29186a2..0000000000
--- a/src/legacy/abis/types/factories/Erc20Bytes32__factory.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-
-import { Contract, Signer, utils } from "ethers";
-import { Provider } from "@ethersproject/providers";
-import type { Erc20Bytes32, Erc20Bytes32Interface } from "../Erc20Bytes32";
-
-const _abi = [
-  {
-    constant: true,
-    inputs: [],
-    name: "name",
-    outputs: [
-      {
-        name: "",
-        type: "bytes32",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: "symbol",
-    outputs: [
-      {
-        name: "",
-        type: "bytes32",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-];
-
-export class Erc20Bytes32__factory {
-  static readonly abi = _abi;
-  static createInterface(): Erc20Bytes32Interface {
-    return new utils.Interface(_abi) as Erc20Bytes32Interface;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): Erc20Bytes32 {
-    return new Contract(address, _abi, signerOrProvider) as Erc20Bytes32;
-  }
-}
diff --git a/src/legacy/abis/types/factories/Erc20__factory.ts b/src/legacy/abis/types/factories/Erc20__factory.ts
deleted file mode 100644
index 1d7aaa561a..0000000000
--- a/src/legacy/abis/types/factories/Erc20__factory.ts
+++ /dev/null
@@ -1,240 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-
-import { Contract, Signer, utils } from "ethers";
-import type { Provider } from "@ethersproject/providers";
-import type { Erc20, Erc20Interface } from "../Erc20";
-
-const _abi = [
-  {
-    constant: true,
-    inputs: [],
-    name: "name",
-    outputs: [
-      {
-        name: "",
-        type: "string",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: false,
-    inputs: [
-      {
-        name: "_spender",
-        type: "address",
-      },
-      {
-        name: "_value",
-        type: "uint256",
-      },
-    ],
-    name: "approve",
-    outputs: [
-      {
-        name: "",
-        type: "bool",
-      },
-    ],
-    payable: false,
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: "totalSupply",
-    outputs: [
-      {
-        name: "",
-        type: "uint256",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: false,
-    inputs: [
-      {
-        name: "_from",
-        type: "address",
-      },
-      {
-        name: "_to",
-        type: "address",
-      },
-      {
-        name: "_value",
-        type: "uint256",
-      },
-    ],
-    name: "transferFrom",
-    outputs: [
-      {
-        name: "",
-        type: "bool",
-      },
-    ],
-    payable: false,
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: "decimals",
-    outputs: [
-      {
-        name: "",
-        type: "uint8",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [
-      {
-        name: "_owner",
-        type: "address",
-      },
-    ],
-    name: "balanceOf",
-    outputs: [
-      {
-        name: "balance",
-        type: "uint256",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: "symbol",
-    outputs: [
-      {
-        name: "",
-        type: "string",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: false,
-    inputs: [
-      {
-        name: "_to",
-        type: "address",
-      },
-      {
-        name: "_value",
-        type: "uint256",
-      },
-    ],
-    name: "transfer",
-    outputs: [
-      {
-        name: "",
-        type: "bool",
-      },
-    ],
-    payable: false,
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [
-      {
-        name: "_owner",
-        type: "address",
-      },
-      {
-        name: "_spender",
-        type: "address",
-      },
-    ],
-    name: "allowance",
-    outputs: [
-      {
-        name: "",
-        type: "uint256",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    payable: true,
-    stateMutability: "payable",
-    type: "fallback",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        name: "owner",
-        type: "address",
-      },
-      {
-        indexed: true,
-        name: "spender",
-        type: "address",
-      },
-      {
-        indexed: false,
-        name: "value",
-        type: "uint256",
-      },
-    ],
-    name: "Approval",
-    type: "event",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        name: "from",
-        type: "address",
-      },
-      {
-        indexed: true,
-        name: "to",
-        type: "address",
-      },
-      {
-        indexed: false,
-        name: "value",
-        type: "uint256",
-      },
-    ],
-    name: "Transfer",
-    type: "event",
-  },
-] as const;
-
-export class Erc20__factory {
-  static readonly abi = _abi;
-  static createInterface(): Erc20Interface {
-    return new utils.Interface(_abi) as Erc20Interface;
-  }
-  static connect(address: string, signerOrProvider: Signer | Provider): Erc20 {
-    return new Contract(address, _abi, signerOrProvider) as Erc20;
-  }
-}
diff --git a/src/legacy/abis/types/factories/Erc20_bytes32__factory.ts b/src/legacy/abis/types/factories/Erc20_bytes32__factory.ts
deleted file mode 100644
index 691f725fa3..0000000000
--- a/src/legacy/abis/types/factories/Erc20_bytes32__factory.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-
-import { Contract, Signer, utils } from "ethers";
-import type { Provider } from "@ethersproject/providers";
-import type { Erc20_bytes32, Erc20_bytes32Interface } from "../Erc20_bytes32";
-
-const _abi = [
-  {
-    constant: true,
-    inputs: [],
-    name: "name",
-    outputs: [
-      {
-        name: "",
-        type: "bytes32",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: "symbol",
-    outputs: [
-      {
-        name: "",
-        type: "bytes32",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-] as const;
-
-export class Erc20_bytes32__factory {
-  static readonly abi = _abi;
-  static createInterface(): Erc20_bytes32Interface {
-    return new utils.Interface(_abi) as Erc20_bytes32Interface;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): Erc20_bytes32 {
-    return new Contract(address, _abi, signerOrProvider) as Erc20_bytes32;
-  }
-}
diff --git a/src/legacy/abis/types/factories/Erc721__factory.ts b/src/legacy/abis/types/factories/Erc721__factory.ts
deleted file mode 100644
index e727f241b0..0000000000
--- a/src/legacy/abis/types/factories/Erc721__factory.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-
-import { Contract, Signer, utils } from "ethers";
-import type { Provider } from "@ethersproject/providers";
-import type { Erc721, Erc721Interface } from "../Erc721";
-
-const _abi = [
-  {
-    inputs: [
-      {
-        internalType: "uint256",
-        name: "tokenId",
-        type: "uint256",
-      },
-    ],
-    name: "ownerOf",
-    outputs: [
-      {
-        internalType: "address",
-        name: "",
-        type: "address",
-      },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        internalType: "uint256",
-        name: "tokenId",
-        type: "uint256",
-      },
-    ],
-    name: "tokenURI",
-    outputs: [
-      {
-        internalType: "string",
-        name: "",
-        type: "string",
-      },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-] as const;
-
-export class Erc721__factory {
-  static readonly abi = _abi;
-  static createInterface(): Erc721Interface {
-    return new utils.Interface(_abi) as Erc721Interface;
-  }
-  static connect(address: string, signerOrProvider: Signer | Provider): Erc721 {
-    return new Contract(address, _abi, signerOrProvider) as Erc721;
-  }
-}
diff --git a/src/legacy/abis/types/factories/GovernorBravo__factory.ts b/src/legacy/abis/types/factories/GovernorBravo__factory.ts
deleted file mode 100644
index 1ef2bde6b4..0000000000
--- a/src/legacy/abis/types/factories/GovernorBravo__factory.ts
+++ /dev/null
@@ -1,1067 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-
-import { Contract, Signer, utils } from "ethers";
-import type { Provider } from "@ethersproject/providers";
-import type { GovernorBravo, GovernorBravoInterface } from "../GovernorBravo";
-
-const _abi = [
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        internalType: "address",
-        name: "oldAdmin",
-        type: "address",
-      },
-      {
-        indexed: false,
-        internalType: "address",
-        name: "newAdmin",
-        type: "address",
-      },
-    ],
-    name: "NewAdmin",
-    type: "event",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        internalType: "address",
-        name: "oldImplementation",
-        type: "address",
-      },
-      {
-        indexed: false,
-        internalType: "address",
-        name: "newImplementation",
-        type: "address",
-      },
-    ],
-    name: "NewImplementation",
-    type: "event",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        internalType: "address",
-        name: "oldPendingAdmin",
-        type: "address",
-      },
-      {
-        indexed: false,
-        internalType: "address",
-        name: "newPendingAdmin",
-        type: "address",
-      },
-    ],
-    name: "NewPendingAdmin",
-    type: "event",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "id",
-        type: "uint256",
-      },
-    ],
-    name: "ProposalCanceled",
-    type: "event",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "id",
-        type: "uint256",
-      },
-      {
-        indexed: false,
-        internalType: "address",
-        name: "proposer",
-        type: "address",
-      },
-      {
-        indexed: false,
-        internalType: "address[]",
-        name: "targets",
-        type: "address[]",
-      },
-      {
-        indexed: false,
-        internalType: "uint256[]",
-        name: "values",
-        type: "uint256[]",
-      },
-      {
-        indexed: false,
-        internalType: "string[]",
-        name: "signatures",
-        type: "string[]",
-      },
-      {
-        indexed: false,
-        internalType: "bytes[]",
-        name: "calldatas",
-        type: "bytes[]",
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "startBlock",
-        type: "uint256",
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "endBlock",
-        type: "uint256",
-      },
-      {
-        indexed: false,
-        internalType: "string",
-        name: "description",
-        type: "string",
-      },
-    ],
-    name: "ProposalCreated",
-    type: "event",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "id",
-        type: "uint256",
-      },
-    ],
-    name: "ProposalExecuted",
-    type: "event",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "id",
-        type: "uint256",
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "eta",
-        type: "uint256",
-      },
-    ],
-    name: "ProposalQueued",
-    type: "event",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "oldProposalThreshold",
-        type: "uint256",
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "newProposalThreshold",
-        type: "uint256",
-      },
-    ],
-    name: "ProposalThresholdSet",
-    type: "event",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "address",
-        name: "voter",
-        type: "address",
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "proposalId",
-        type: "uint256",
-      },
-      {
-        indexed: false,
-        internalType: "uint8",
-        name: "support",
-        type: "uint8",
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "votes",
-        type: "uint256",
-      },
-      {
-        indexed: false,
-        internalType: "string",
-        name: "reason",
-        type: "string",
-      },
-    ],
-    name: "VoteCast",
-    type: "event",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "oldVotingDelay",
-        type: "uint256",
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "newVotingDelay",
-        type: "uint256",
-      },
-    ],
-    name: "VotingDelaySet",
-    type: "event",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "oldVotingPeriod",
-        type: "uint256",
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "newVotingPeriod",
-        type: "uint256",
-      },
-    ],
-    name: "VotingPeriodSet",
-    type: "event",
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: "BALLOT_TYPEHASH",
-    outputs: [
-      {
-        internalType: "bytes32",
-        name: "",
-        type: "bytes32",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: "DOMAIN_TYPEHASH",
-    outputs: [
-      {
-        internalType: "bytes32",
-        name: "",
-        type: "bytes32",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: "MAX_PROPOSAL_THRESHOLD",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: "MAX_VOTING_DELAY",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: "MAX_VOTING_PERIOD",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: "MIN_PROPOSAL_THRESHOLD",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: "MIN_VOTING_DELAY",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: "MIN_VOTING_PERIOD",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: false,
-    inputs: [],
-    name: "_acceptAdmin",
-    outputs: [],
-    payable: false,
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    constant: false,
-    inputs: [
-      {
-        internalType: "uint256",
-        name: "proposalCount",
-        type: "uint256",
-      },
-    ],
-    name: "_initiate",
-    outputs: [],
-    payable: false,
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    constant: false,
-    inputs: [
-      {
-        internalType: "address",
-        name: "newPendingAdmin",
-        type: "address",
-      },
-    ],
-    name: "_setPendingAdmin",
-    outputs: [],
-    payable: false,
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    constant: false,
-    inputs: [
-      {
-        internalType: "uint256",
-        name: "newProposalThreshold",
-        type: "uint256",
-      },
-    ],
-    name: "_setProposalThreshold",
-    outputs: [],
-    payable: false,
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    constant: false,
-    inputs: [
-      {
-        internalType: "uint256",
-        name: "newVotingDelay",
-        type: "uint256",
-      },
-    ],
-    name: "_setVotingDelay",
-    outputs: [],
-    payable: false,
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    constant: false,
-    inputs: [
-      {
-        internalType: "uint256",
-        name: "newVotingPeriod",
-        type: "uint256",
-      },
-    ],
-    name: "_setVotingPeriod",
-    outputs: [],
-    payable: false,
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: "admin",
-    outputs: [
-      {
-        internalType: "address",
-        name: "",
-        type: "address",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: false,
-    inputs: [
-      {
-        internalType: "uint256",
-        name: "proposalId",
-        type: "uint256",
-      },
-    ],
-    name: "cancel",
-    outputs: [],
-    payable: false,
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    constant: false,
-    inputs: [
-      {
-        internalType: "uint256",
-        name: "proposalId",
-        type: "uint256",
-      },
-      {
-        internalType: "uint8",
-        name: "support",
-        type: "uint8",
-      },
-    ],
-    name: "castVote",
-    outputs: [],
-    payable: false,
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    constant: false,
-    inputs: [
-      {
-        internalType: "uint256",
-        name: "proposalId",
-        type: "uint256",
-      },
-      {
-        internalType: "uint8",
-        name: "support",
-        type: "uint8",
-      },
-      {
-        internalType: "uint8",
-        name: "v",
-        type: "uint8",
-      },
-      {
-        internalType: "bytes32",
-        name: "r",
-        type: "bytes32",
-      },
-      {
-        internalType: "bytes32",
-        name: "s",
-        type: "bytes32",
-      },
-    ],
-    name: "castVoteBySig",
-    outputs: [],
-    payable: false,
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    constant: false,
-    inputs: [
-      {
-        internalType: "uint256",
-        name: "proposalId",
-        type: "uint256",
-      },
-      {
-        internalType: "uint8",
-        name: "support",
-        type: "uint8",
-      },
-      {
-        internalType: "string",
-        name: "reason",
-        type: "string",
-      },
-    ],
-    name: "castVoteWithReason",
-    outputs: [],
-    payable: false,
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    constant: false,
-    inputs: [
-      {
-        internalType: "uint256",
-        name: "proposalId",
-        type: "uint256",
-      },
-    ],
-    name: "execute",
-    outputs: [],
-    payable: true,
-    stateMutability: "payable",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [
-      {
-        internalType: "uint256",
-        name: "proposalId",
-        type: "uint256",
-      },
-    ],
-    name: "getActions",
-    outputs: [
-      {
-        internalType: "address[]",
-        name: "targets",
-        type: "address[]",
-      },
-      {
-        internalType: "uint256[]",
-        name: "values",
-        type: "uint256[]",
-      },
-      {
-        internalType: "string[]",
-        name: "signatures",
-        type: "string[]",
-      },
-      {
-        internalType: "bytes[]",
-        name: "calldatas",
-        type: "bytes[]",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [
-      {
-        internalType: "uint256",
-        name: "proposalId",
-        type: "uint256",
-      },
-      {
-        internalType: "address",
-        name: "voter",
-        type: "address",
-      },
-    ],
-    name: "getReceipt",
-    outputs: [
-      {
-        components: [
-          {
-            internalType: "bool",
-            name: "hasVoted",
-            type: "bool",
-          },
-          {
-            internalType: "uint8",
-            name: "support",
-            type: "uint8",
-          },
-          {
-            internalType: "uint96",
-            name: "votes",
-            type: "uint96",
-          },
-        ],
-        internalType: "struct GovernorBravoDelegateStorageV1.Receipt",
-        name: "",
-        type: "tuple",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: "implementation",
-    outputs: [
-      {
-        internalType: "address",
-        name: "",
-        type: "address",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: "initialProposalId",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: false,
-    inputs: [
-      {
-        internalType: "address",
-        name: "timelock_",
-        type: "address",
-      },
-      {
-        internalType: "address",
-        name: "uni_",
-        type: "address",
-      },
-      {
-        internalType: "uint256",
-        name: "votingPeriod_",
-        type: "uint256",
-      },
-      {
-        internalType: "uint256",
-        name: "votingDelay_",
-        type: "uint256",
-      },
-      {
-        internalType: "uint256",
-        name: "proposalThreshold_",
-        type: "uint256",
-      },
-    ],
-    name: "initialize",
-    outputs: [],
-    payable: false,
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [
-      {
-        internalType: "address",
-        name: "",
-        type: "address",
-      },
-    ],
-    name: "latestProposalIds",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: "name",
-    outputs: [
-      {
-        internalType: "string",
-        name: "",
-        type: "string",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: "pendingAdmin",
-    outputs: [
-      {
-        internalType: "address",
-        name: "",
-        type: "address",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: "proposalCount",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: "proposalMaxOperations",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: "proposalThreshold",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256",
-      },
-    ],
-    name: "proposals",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "id",
-        type: "uint256",
-      },
-      {
-        internalType: "address",
-        name: "proposer",
-        type: "address",
-      },
-      {
-        internalType: "uint256",
-        name: "eta",
-        type: "uint256",
-      },
-      {
-        internalType: "uint256",
-        name: "startBlock",
-        type: "uint256",
-      },
-      {
-        internalType: "uint256",
-        name: "endBlock",
-        type: "uint256",
-      },
-      {
-        internalType: "uint256",
-        name: "forVotes",
-        type: "uint256",
-      },
-      {
-        internalType: "uint256",
-        name: "againstVotes",
-        type: "uint256",
-      },
-      {
-        internalType: "uint256",
-        name: "abstainVotes",
-        type: "uint256",
-      },
-      {
-        internalType: "bool",
-        name: "canceled",
-        type: "bool",
-      },
-      {
-        internalType: "bool",
-        name: "executed",
-        type: "bool",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: false,
-    inputs: [
-      {
-        internalType: "address[]",
-        name: "targets",
-        type: "address[]",
-      },
-      {
-        internalType: "uint256[]",
-        name: "values",
-        type: "uint256[]",
-      },
-      {
-        internalType: "string[]",
-        name: "signatures",
-        type: "string[]",
-      },
-      {
-        internalType: "bytes[]",
-        name: "calldatas",
-        type: "bytes[]",
-      },
-      {
-        internalType: "string",
-        name: "description",
-        type: "string",
-      },
-    ],
-    name: "propose",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256",
-      },
-    ],
-    payable: false,
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    constant: false,
-    inputs: [
-      {
-        internalType: "uint256",
-        name: "proposalId",
-        type: "uint256",
-      },
-    ],
-    name: "queue",
-    outputs: [],
-    payable: false,
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: "quorumVotes",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [
-      {
-        internalType: "uint256",
-        name: "proposalId",
-        type: "uint256",
-      },
-    ],
-    name: "state",
-    outputs: [
-      {
-        internalType: "enum GovernorBravoDelegateStorageV1.ProposalState",
-        name: "",
-        type: "uint8",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: "timelock",
-    outputs: [
-      {
-        internalType: "contract TimelockInterface",
-        name: "",
-        type: "address",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: "uni",
-    outputs: [
-      {
-        internalType: "contract UniInterface",
-        name: "",
-        type: "address",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: "votingDelay",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: "votingPeriod",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-] as const;
-
-export class GovernorBravo__factory {
-  static readonly abi = _abi;
-  static createInterface(): GovernorBravoInterface {
-    return new utils.Interface(_abi) as GovernorBravoInterface;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): GovernorBravo {
-    return new Contract(address, _abi, signerOrProvider) as GovernorBravo;
-  }
-}
diff --git a/src/legacy/abis/types/factories/Multicall2__factory.ts b/src/legacy/abis/types/factories/Multicall2__factory.ts
deleted file mode 100644
index c36e6a9777..0000000000
--- a/src/legacy/abis/types/factories/Multicall2__factory.ts
+++ /dev/null
@@ -1,334 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-
-import { Contract, Signer, utils } from "ethers";
-import type { Provider } from "@ethersproject/providers";
-import type { Multicall2, Multicall2Interface } from "../Multicall2";
-
-const _abi = [
-  {
-    inputs: [
-      {
-        components: [
-          {
-            internalType: "address",
-            name: "target",
-            type: "address",
-          },
-          {
-            internalType: "bytes",
-            name: "callData",
-            type: "bytes",
-          },
-        ],
-        internalType: "struct Multicall2.Call[]",
-        name: "calls",
-        type: "tuple[]",
-      },
-    ],
-    name: "aggregate",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "blockNumber",
-        type: "uint256",
-      },
-      {
-        internalType: "bytes[]",
-        name: "returnData",
-        type: "bytes[]",
-      },
-    ],
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        components: [
-          {
-            internalType: "address",
-            name: "target",
-            type: "address",
-          },
-          {
-            internalType: "bytes",
-            name: "callData",
-            type: "bytes",
-          },
-        ],
-        internalType: "struct Multicall2.Call[]",
-        name: "calls",
-        type: "tuple[]",
-      },
-    ],
-    name: "blockAndAggregate",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "blockNumber",
-        type: "uint256",
-      },
-      {
-        internalType: "bytes32",
-        name: "blockHash",
-        type: "bytes32",
-      },
-      {
-        components: [
-          {
-            internalType: "bool",
-            name: "success",
-            type: "bool",
-          },
-          {
-            internalType: "bytes",
-            name: "returnData",
-            type: "bytes",
-          },
-        ],
-        internalType: "struct Multicall2.Result[]",
-        name: "returnData",
-        type: "tuple[]",
-      },
-    ],
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        internalType: "uint256",
-        name: "blockNumber",
-        type: "uint256",
-      },
-    ],
-    name: "getBlockHash",
-    outputs: [
-      {
-        internalType: "bytes32",
-        name: "blockHash",
-        type: "bytes32",
-      },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [],
-    name: "getBlockNumber",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "blockNumber",
-        type: "uint256",
-      },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [],
-    name: "getCurrentBlockCoinbase",
-    outputs: [
-      {
-        internalType: "address",
-        name: "coinbase",
-        type: "address",
-      },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [],
-    name: "getCurrentBlockDifficulty",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "difficulty",
-        type: "uint256",
-      },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [],
-    name: "getCurrentBlockGasLimit",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "gaslimit",
-        type: "uint256",
-      },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [],
-    name: "getCurrentBlockTimestamp",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "timestamp",
-        type: "uint256",
-      },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "addr",
-        type: "address",
-      },
-    ],
-    name: "getEthBalance",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "balance",
-        type: "uint256",
-      },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [],
-    name: "getLastBlockHash",
-    outputs: [
-      {
-        internalType: "bytes32",
-        name: "blockHash",
-        type: "bytes32",
-      },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        internalType: "bool",
-        name: "requireSuccess",
-        type: "bool",
-      },
-      {
-        components: [
-          {
-            internalType: "address",
-            name: "target",
-            type: "address",
-          },
-          {
-            internalType: "bytes",
-            name: "callData",
-            type: "bytes",
-          },
-        ],
-        internalType: "struct Multicall2.Call[]",
-        name: "calls",
-        type: "tuple[]",
-      },
-    ],
-    name: "tryAggregate",
-    outputs: [
-      {
-        components: [
-          {
-            internalType: "bool",
-            name: "success",
-            type: "bool",
-          },
-          {
-            internalType: "bytes",
-            name: "returnData",
-            type: "bytes",
-          },
-        ],
-        internalType: "struct Multicall2.Result[]",
-        name: "returnData",
-        type: "tuple[]",
-      },
-    ],
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        internalType: "bool",
-        name: "requireSuccess",
-        type: "bool",
-      },
-      {
-        components: [
-          {
-            internalType: "address",
-            name: "target",
-            type: "address",
-          },
-          {
-            internalType: "bytes",
-            name: "callData",
-            type: "bytes",
-          },
-        ],
-        internalType: "struct Multicall2.Call[]",
-        name: "calls",
-        type: "tuple[]",
-      },
-    ],
-    name: "tryBlockAndAggregate",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "blockNumber",
-        type: "uint256",
-      },
-      {
-        internalType: "bytes32",
-        name: "blockHash",
-        type: "bytes32",
-      },
-      {
-        components: [
-          {
-            internalType: "bool",
-            name: "success",
-            type: "bool",
-          },
-          {
-            internalType: "bytes",
-            name: "returnData",
-            type: "bytes",
-          },
-        ],
-        internalType: "struct Multicall2.Result[]",
-        name: "returnData",
-        type: "tuple[]",
-      },
-    ],
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-] as const;
-
-export class Multicall2__factory {
-  static readonly abi = _abi;
-  static createInterface(): Multicall2Interface {
-    return new utils.Interface(_abi) as Multicall2Interface;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): Multicall2 {
-    return new Contract(address, _abi, signerOrProvider) as Multicall2;
-  }
-}
diff --git a/src/legacy/abis/types/factories/Multicall__factory.ts b/src/legacy/abis/types/factories/Multicall__factory.ts
deleted file mode 100644
index 1327d62622..0000000000
--- a/src/legacy/abis/types/factories/Multicall__factory.ts
+++ /dev/null
@@ -1,351 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-
-import { Contract, Signer, utils } from "ethers";
-import type { Provider } from "@ethersproject/providers";
-import type { Multicall, MulticallInterface } from "../Multicall";
-
-const _abi = [
-  {
-    inputs: [
-      {
-        components: [
-          {
-            internalType: "address",
-            name: "target",
-            type: "address",
-          },
-          {
-            internalType: "bytes",
-            name: "callData",
-            type: "bytes",
-          },
-        ],
-        internalType: "struct Multicall2.Call[]",
-        name: "calls",
-        type: "tuple[]",
-      },
-    ],
-    name: "aggregate",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "blockNumber",
-        type: "uint256",
-      },
-      {
-        internalType: "bytes[]",
-        name: "returnData",
-        type: "bytes[]",
-      },
-    ],
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        components: [
-          {
-            internalType: "address",
-            name: "target",
-            type: "address",
-          },
-          {
-            internalType: "bytes",
-            name: "callData",
-            type: "bytes",
-          },
-        ],
-        internalType: "struct Multicall2.Call[]",
-        name: "calls",
-        type: "tuple[]",
-      },
-    ],
-    name: "blockAndAggregate",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "blockNumber",
-        type: "uint256",
-      },
-      {
-        internalType: "bytes32",
-        name: "blockHash",
-        type: "bytes32",
-      },
-      {
-        components: [
-          {
-            internalType: "bool",
-            name: "success",
-            type: "bool",
-          },
-          {
-            internalType: "bytes",
-            name: "returnData",
-            type: "bytes",
-          },
-        ],
-        internalType: "struct Multicall2.Result[]",
-        name: "returnData",
-        type: "tuple[]",
-      },
-    ],
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        internalType: "uint256",
-        name: "blockNumber",
-        type: "uint256",
-      },
-    ],
-    name: "getBlockHash",
-    outputs: [
-      {
-        internalType: "bytes32",
-        name: "blockHash",
-        type: "bytes32",
-      },
-      {
-        components: [
-          {
-            internalType: "bool",
-            name: "success",
-            type: "bool",
-          },
-          {
-            internalType: "bytes",
-            name: "returnData",
-            type: "bytes",
-          },
-        ],
-        internalType: "struct Multicall2.Result[]",
-        name: "returnData",
-        type: "tuple[]",
-      },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [],
-    name: "getBlockNumber",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "blockNumber",
-        type: "uint256",
-      },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [],
-    name: "getCurrentBlockCoinbase",
-    outputs: [
-      {
-        internalType: "address",
-        name: "coinbase",
-        type: "address",
-      },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [],
-    name: "getCurrentBlockDifficulty",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "difficulty",
-        type: "uint256",
-      },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [],
-    name: "getCurrentBlockGasLimit",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "gaslimit",
-        type: "uint256",
-      },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [],
-    name: "getCurrentBlockTimestamp",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "timestamp",
-        type: "uint256",
-      },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "addr",
-        type: "address",
-      },
-    ],
-    name: "getEthBalance",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "balance",
-        type: "uint256",
-      },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [],
-    name: "getLastBlockHash",
-    outputs: [
-      {
-        internalType: "bytes32",
-        name: "blockHash",
-        type: "bytes32",
-      },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        internalType: "bool",
-        name: "requireSuccess",
-        type: "bool",
-      },
-      {
-        components: [
-          {
-            internalType: "address",
-            name: "target",
-            type: "address",
-          },
-          {
-            internalType: "bytes",
-            name: "callData",
-            type: "bytes",
-          },
-        ],
-        internalType: "struct Multicall2.Call[]",
-        name: "calls",
-        type: "tuple[]",
-      },
-    ],
-    name: "tryAggregate",
-    outputs: [
-      {
-        components: [
-          {
-            internalType: "bool",
-            name: "success",
-            type: "bool",
-          },
-          {
-            internalType: "bytes",
-            name: "returnData",
-            type: "bytes",
-          },
-        ],
-        internalType: "struct Multicall2.Result[]",
-        name: "returnData",
-        type: "tuple[]",
-      },
-    ],
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        internalType: "bool",
-        name: "requireSuccess",
-        type: "bool",
-      },
-      {
-        components: [
-          {
-            internalType: "address",
-            name: "target",
-            type: "address",
-          },
-          {
-            internalType: "bytes",
-            name: "callData",
-            type: "bytes",
-          },
-        ],
-        internalType: "struct Multicall2.Call[]",
-        name: "calls",
-        type: "tuple[]",
-      },
-    ],
-    name: "tryBlockAndAggregate",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "blockNumber",
-        type: "uint256",
-      },
-      {
-        internalType: "bytes32",
-        name: "blockHash",
-        type: "bytes32",
-      },
-      {
-        components: [
-          {
-            internalType: "bool",
-            name: "success",
-            type: "bool",
-          },
-          {
-            internalType: "bytes",
-            name: "returnData",
-            type: "bytes",
-          },
-        ],
-        internalType: "struct Multicall2.Result[]",
-        name: "returnData",
-        type: "tuple[]",
-      },
-    ],
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-] as const;
-
-export class Multicall__factory {
-  static readonly abi = _abi;
-  static createInterface(): MulticallInterface {
-    return new utils.Interface(_abi) as MulticallInterface;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): Multicall {
-    return new Contract(address, _abi, signerOrProvider) as Multicall;
-  }
-}
diff --git a/src/legacy/abis/types/factories/Unisocks__factory.ts b/src/legacy/abis/types/factories/Unisocks__factory.ts
deleted file mode 100644
index db45a679fd..0000000000
--- a/src/legacy/abis/types/factories/Unisocks__factory.ts
+++ /dev/null
@@ -1,492 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-
-import { Contract, Signer, utils } from "ethers";
-import type { Provider } from "@ethersproject/providers";
-import type { Unisocks, UnisocksInterface } from "../Unisocks";
-
-const _abi = [
-  {
-    name: "Transfer",
-    inputs: [
-      {
-        type: "address",
-        name: "_from",
-        indexed: true,
-      },
-      {
-        type: "address",
-        name: "_to",
-        indexed: true,
-      },
-      {
-        type: "uint256",
-        name: "_tokenId",
-        indexed: true,
-      },
-    ],
-    anonymous: false,
-    type: "event",
-  },
-  {
-    name: "Approval",
-    inputs: [
-      {
-        type: "address",
-        name: "_owner",
-        indexed: true,
-      },
-      {
-        type: "address",
-        name: "_approved",
-        indexed: true,
-      },
-      {
-        type: "uint256",
-        name: "_tokenId",
-        indexed: true,
-      },
-    ],
-    anonymous: false,
-    type: "event",
-  },
-  {
-    name: "ApprovalForAll",
-    inputs: [
-      {
-        type: "address",
-        name: "_owner",
-        indexed: true,
-      },
-      {
-        type: "address",
-        name: "_operator",
-        indexed: true,
-      },
-      {
-        type: "bool",
-        name: "_approved",
-        indexed: false,
-      },
-    ],
-    anonymous: false,
-    type: "event",
-  },
-  {
-    outputs: [],
-    inputs: [],
-    constant: false,
-    payable: false,
-    type: "constructor",
-  },
-  {
-    name: "tokenURI",
-    outputs: [
-      {
-        type: "string",
-        name: "out",
-      },
-    ],
-    inputs: [
-      {
-        type: "uint256",
-        name: "_tokenId",
-      },
-    ],
-    constant: true,
-    payable: false,
-    type: "function",
-    gas: "22405",
-  },
-  {
-    name: "tokenByIndex",
-    outputs: [
-      {
-        type: "uint256",
-        name: "out",
-      },
-    ],
-    inputs: [
-      {
-        type: "uint256",
-        name: "_index",
-      },
-    ],
-    constant: true,
-    payable: false,
-    type: "function",
-    gas: "631",
-  },
-  {
-    name: "tokenOfOwnerByIndex",
-    outputs: [
-      {
-        type: "uint256",
-        name: "out",
-      },
-    ],
-    inputs: [
-      {
-        type: "address",
-        name: "_owner",
-      },
-      {
-        type: "uint256",
-        name: "_index",
-      },
-    ],
-    constant: true,
-    payable: false,
-    type: "function",
-    gas: "1248",
-  },
-  {
-    name: "transferFrom",
-    outputs: [],
-    inputs: [
-      {
-        type: "address",
-        name: "_from",
-      },
-      {
-        type: "address",
-        name: "_to",
-      },
-      {
-        type: "uint256",
-        name: "_tokenId",
-      },
-    ],
-    constant: false,
-    payable: false,
-    type: "function",
-    gas: "259486",
-  },
-  {
-    name: "safeTransferFrom",
-    outputs: [],
-    inputs: [
-      {
-        type: "address",
-        name: "_from",
-      },
-      {
-        type: "address",
-        name: "_to",
-      },
-      {
-        type: "uint256",
-        name: "_tokenId",
-      },
-    ],
-    constant: false,
-    payable: false,
-    type: "function",
-  },
-  {
-    name: "safeTransferFrom",
-    outputs: [],
-    inputs: [
-      {
-        type: "address",
-        name: "_from",
-      },
-      {
-        type: "address",
-        name: "_to",
-      },
-      {
-        type: "uint256",
-        name: "_tokenId",
-      },
-      {
-        type: "bytes",
-        name: "_data",
-      },
-    ],
-    constant: false,
-    payable: false,
-    type: "function",
-  },
-  {
-    name: "approve",
-    outputs: [],
-    inputs: [
-      {
-        type: "address",
-        name: "_approved",
-      },
-      {
-        type: "uint256",
-        name: "_tokenId",
-      },
-    ],
-    constant: false,
-    payable: false,
-    type: "function",
-    gas: "38422",
-  },
-  {
-    name: "setApprovalForAll",
-    outputs: [],
-    inputs: [
-      {
-        type: "address",
-        name: "_operator",
-      },
-      {
-        type: "bool",
-        name: "_approved",
-      },
-    ],
-    constant: false,
-    payable: false,
-    type: "function",
-    gas: "38016",
-  },
-  {
-    name: "mint",
-    outputs: [
-      {
-        type: "bool",
-        name: "out",
-      },
-    ],
-    inputs: [
-      {
-        type: "address",
-        name: "_to",
-      },
-    ],
-    constant: false,
-    payable: false,
-    type: "function",
-    gas: "182636",
-  },
-  {
-    name: "changeMinter",
-    outputs: [],
-    inputs: [
-      {
-        type: "address",
-        name: "_minter",
-      },
-    ],
-    constant: false,
-    payable: false,
-    type: "function",
-    gas: "35897",
-  },
-  {
-    name: "changeURI",
-    outputs: [],
-    inputs: [
-      {
-        type: "address",
-        name: "_newURI",
-      },
-    ],
-    constant: false,
-    payable: false,
-    type: "function",
-    gas: "35927",
-  },
-  {
-    name: "name",
-    outputs: [
-      {
-        type: "string",
-        name: "out",
-      },
-    ],
-    inputs: [],
-    constant: true,
-    payable: false,
-    type: "function",
-    gas: "6612",
-  },
-  {
-    name: "symbol",
-    outputs: [
-      {
-        type: "string",
-        name: "out",
-      },
-    ],
-    inputs: [],
-    constant: true,
-    payable: false,
-    type: "function",
-    gas: "6642",
-  },
-  {
-    name: "totalSupply",
-    outputs: [
-      {
-        type: "uint256",
-        name: "out",
-      },
-    ],
-    inputs: [],
-    constant: true,
-    payable: false,
-    type: "function",
-    gas: "873",
-  },
-  {
-    name: "minter",
-    outputs: [
-      {
-        type: "address",
-        name: "out",
-      },
-    ],
-    inputs: [],
-    constant: true,
-    payable: false,
-    type: "function",
-    gas: "903",
-  },
-  {
-    name: "socks",
-    outputs: [
-      {
-        type: "address",
-        name: "out",
-        unit: "Socks",
-      },
-    ],
-    inputs: [],
-    constant: true,
-    payable: false,
-    type: "function",
-    gas: "933",
-  },
-  {
-    name: "newURI",
-    outputs: [
-      {
-        type: "address",
-        name: "out",
-      },
-    ],
-    inputs: [],
-    constant: true,
-    payable: false,
-    type: "function",
-    gas: "963",
-  },
-  {
-    name: "ownerOf",
-    outputs: [
-      {
-        type: "address",
-        name: "out",
-      },
-    ],
-    inputs: [
-      {
-        type: "uint256",
-        name: "arg0",
-      },
-    ],
-    constant: true,
-    payable: false,
-    type: "function",
-    gas: "1126",
-  },
-  {
-    name: "balanceOf",
-    outputs: [
-      {
-        type: "uint256",
-        name: "out",
-      },
-    ],
-    inputs: [
-      {
-        type: "address",
-        name: "arg0",
-      },
-    ],
-    constant: true,
-    payable: false,
-    type: "function",
-    gas: "1195",
-  },
-  {
-    name: "getApproved",
-    outputs: [
-      {
-        type: "address",
-        name: "out",
-      },
-    ],
-    inputs: [
-      {
-        type: "uint256",
-        name: "arg0",
-      },
-    ],
-    constant: true,
-    payable: false,
-    type: "function",
-    gas: "1186",
-  },
-  {
-    name: "isApprovedForAll",
-    outputs: [
-      {
-        type: "bool",
-        name: "out",
-      },
-    ],
-    inputs: [
-      {
-        type: "address",
-        name: "arg0",
-      },
-      {
-        type: "address",
-        name: "arg1",
-      },
-    ],
-    constant: true,
-    payable: false,
-    type: "function",
-    gas: "1415",
-  },
-  {
-    name: "supportsInterface",
-    outputs: [
-      {
-        type: "bool",
-        name: "out",
-      },
-    ],
-    inputs: [
-      {
-        type: "bytes32",
-        name: "arg0",
-      },
-    ],
-    constant: true,
-    payable: false,
-    type: "function",
-    gas: "1246",
-  },
-] as const;
-
-export class Unisocks__factory {
-  static readonly abi = _abi;
-  static createInterface(): UnisocksInterface {
-    return new utils.Interface(_abi) as UnisocksInterface;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): Unisocks {
-    return new Contract(address, _abi, signerOrProvider) as Unisocks;
-  }
-}
diff --git a/src/legacy/abis/types/factories/Weth__factory.ts b/src/legacy/abis/types/factories/Weth__factory.ts
deleted file mode 100644
index d103c9716d..0000000000
--- a/src/legacy/abis/types/factories/Weth__factory.ts
+++ /dev/null
@@ -1,297 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-
-import { Contract, Signer, utils } from "ethers";
-import type { Provider } from "@ethersproject/providers";
-import type { Weth, WethInterface } from "../Weth";
-
-const _abi = [
-  {
-    constant: true,
-    inputs: [],
-    name: "name",
-    outputs: [
-      {
-        name: "",
-        type: "string",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: false,
-    inputs: [
-      {
-        name: "guy",
-        type: "address",
-      },
-      {
-        name: "wad",
-        type: "uint256",
-      },
-    ],
-    name: "approve",
-    outputs: [
-      {
-        name: "",
-        type: "bool",
-      },
-    ],
-    payable: false,
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: "totalSupply",
-    outputs: [
-      {
-        name: "",
-        type: "uint256",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: false,
-    inputs: [
-      {
-        name: "src",
-        type: "address",
-      },
-      {
-        name: "dst",
-        type: "address",
-      },
-      {
-        name: "wad",
-        type: "uint256",
-      },
-    ],
-    name: "transferFrom",
-    outputs: [
-      {
-        name: "",
-        type: "bool",
-      },
-    ],
-    payable: false,
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    constant: false,
-    inputs: [
-      {
-        name: "wad",
-        type: "uint256",
-      },
-    ],
-    name: "withdraw",
-    outputs: [],
-    payable: false,
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: "decimals",
-    outputs: [
-      {
-        name: "",
-        type: "uint8",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [
-      {
-        name: "",
-        type: "address",
-      },
-    ],
-    name: "balanceOf",
-    outputs: [
-      {
-        name: "",
-        type: "uint256",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: "symbol",
-    outputs: [
-      {
-        name: "",
-        type: "string",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: false,
-    inputs: [
-      {
-        name: "dst",
-        type: "address",
-      },
-      {
-        name: "wad",
-        type: "uint256",
-      },
-    ],
-    name: "transfer",
-    outputs: [
-      {
-        name: "",
-        type: "bool",
-      },
-    ],
-    payable: false,
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    constant: false,
-    inputs: [],
-    name: "deposit",
-    outputs: [],
-    payable: true,
-    stateMutability: "payable",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [
-      {
-        name: "",
-        type: "address",
-      },
-      {
-        name: "",
-        type: "address",
-      },
-    ],
-    name: "allowance",
-    outputs: [
-      {
-        name: "",
-        type: "uint256",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    payable: true,
-    stateMutability: "payable",
-    type: "fallback",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        name: "src",
-        type: "address",
-      },
-      {
-        indexed: true,
-        name: "guy",
-        type: "address",
-      },
-      {
-        indexed: false,
-        name: "wad",
-        type: "uint256",
-      },
-    ],
-    name: "Approval",
-    type: "event",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        name: "src",
-        type: "address",
-      },
-      {
-        indexed: true,
-        name: "dst",
-        type: "address",
-      },
-      {
-        indexed: false,
-        name: "wad",
-        type: "uint256",
-      },
-    ],
-    name: "Transfer",
-    type: "event",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        name: "dst",
-        type: "address",
-      },
-      {
-        indexed: false,
-        name: "wad",
-        type: "uint256",
-      },
-    ],
-    name: "Deposit",
-    type: "event",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        name: "src",
-        type: "address",
-      },
-      {
-        indexed: false,
-        name: "wad",
-        type: "uint256",
-      },
-    ],
-    name: "Withdrawal",
-    type: "event",
-  },
-] as const;
-
-export class Weth__factory {
-  static readonly abi = _abi;
-  static createInterface(): WethInterface {
-    return new utils.Interface(_abi) as WethInterface;
-  }
-  static connect(address: string, signerOrProvider: Signer | Provider): Weth {
-    return new Contract(address, _abi, signerOrProvider) as Weth;
-  }
-}
diff --git a/src/legacy/abis/types/factories/index.ts b/src/legacy/abis/types/factories/index.ts
deleted file mode 100644
index 019bc7a839..0000000000
--- a/src/legacy/abis/types/factories/index.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-export { ArgentWalletContract__factory } from "./ArgentWalletContract__factory";
-export { ArgentWalletDetector__factory } from "./ArgentWalletDetector__factory";
-export { Eip_2612__factory } from "./Eip_2612__factory";
-export { EnsPublicResolver__factory } from "./EnsPublicResolver__factory";
-export { EnsRegistrar__factory } from "./EnsRegistrar__factory";
-export { Erc1155__factory } from "./Erc1155__factory";
-export { Erc20__factory } from "./Erc20__factory";
-export { Erc20_bytes32__factory } from "./Erc20_bytes32__factory";
-export { Erc721__factory } from "./Erc721__factory";
-export { GovernorBravo__factory } from "./GovernorBravo__factory";
-export { Multicall__factory } from "./Multicall__factory";
-export { Multicall2__factory } from "./Multicall2__factory";
-export { Unisocks__factory } from "./Unisocks__factory";
-export { Weth__factory } from "./Weth__factory";
diff --git a/src/legacy/abis/types/index.ts b/src/legacy/abis/types/index.ts
deleted file mode 100644
index 4bab7f79b4..0000000000
--- a/src/legacy/abis/types/index.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-export type { ArgentWalletContract } from "./ArgentWalletContract";
-export type { ArgentWalletDetector } from "./ArgentWalletDetector";
-export type { Eip_2612 } from "./Eip_2612";
-export type { EnsPublicResolver } from "./EnsPublicResolver";
-export type { EnsRegistrar } from "./EnsRegistrar";
-export type { Erc1155 } from "./Erc1155";
-export type { Erc20 } from "./Erc20";
-export type { Erc20_bytes32 } from "./Erc20_bytes32";
-export type { Erc721 } from "./Erc721";
-export type { GovernorBravo } from "./GovernorBravo";
-export type { Multicall } from "./Multicall";
-export type { Multicall2 } from "./Multicall2";
-export type { Unisocks } from "./Unisocks";
-export type { Weth } from "./Weth";
-export * as factories from "./factories";
-export { ArgentWalletContract__factory } from "./factories/ArgentWalletContract__factory";
-export { ArgentWalletDetector__factory } from "./factories/ArgentWalletDetector__factory";
-export { Eip_2612__factory } from "./factories/Eip_2612__factory";
-export { EnsPublicResolver__factory } from "./factories/EnsPublicResolver__factory";
-export { EnsRegistrar__factory } from "./factories/EnsRegistrar__factory";
-export { Erc1155__factory } from "./factories/Erc1155__factory";
-export { Erc20_bytes32__factory } from "./factories/Erc20_bytes32__factory";
-export { Erc20__factory } from "./factories/Erc20__factory";
-export { Erc721__factory } from "./factories/Erc721__factory";
-export { GovernorBravo__factory } from "./factories/GovernorBravo__factory";
-export { Multicall__factory } from "./factories/Multicall__factory";
-export { Multicall2__factory } from "./factories/Multicall2__factory";
-export { Unisocks__factory } from "./factories/Unisocks__factory";
-export { Weth__factory } from "./factories/Weth__factory";
diff --git a/src/legacy/abis/unisocks.json b/src/legacy/abis/unisocks.json
deleted file mode 100644
index 661ece2dee..0000000000
--- a/src/legacy/abis/unisocks.json
+++ /dev/null
@@ -1,471 +0,0 @@
-[
-  {
-    "name": "Transfer",
-    "inputs": [
-      {
-        "type": "address",
-        "name": "_from",
-        "indexed": true
-      },
-      {
-        "type": "address",
-        "name": "_to",
-        "indexed": true
-      },
-      {
-        "type": "uint256",
-        "name": "_tokenId",
-        "indexed": true
-      }
-    ],
-    "anonymous": false,
-    "type": "event"
-  },
-  {
-    "name": "Approval",
-    "inputs": [
-      {
-        "type": "address",
-        "name": "_owner",
-        "indexed": true
-      },
-      {
-        "type": "address",
-        "name": "_approved",
-        "indexed": true
-      },
-      {
-        "type": "uint256",
-        "name": "_tokenId",
-        "indexed": true
-      }
-    ],
-    "anonymous": false,
-    "type": "event"
-  },
-  {
-    "name": "ApprovalForAll",
-    "inputs": [
-      {
-        "type": "address",
-        "name": "_owner",
-        "indexed": true
-      },
-      {
-        "type": "address",
-        "name": "_operator",
-        "indexed": true
-      },
-      {
-        "type": "bool",
-        "name": "_approved",
-        "indexed": false
-      }
-    ],
-    "anonymous": false,
-    "type": "event"
-  },
-  {
-    "outputs": [],
-    "inputs": [],
-    "constant": false,
-    "payable": false,
-    "type": "constructor"
-  },
-  {
-    "name": "tokenURI",
-    "outputs": [
-      {
-        "type": "string",
-        "name": "out"
-      }
-    ],
-    "inputs": [
-      {
-        "type": "uint256",
-        "name": "_tokenId"
-      }
-    ],
-    "constant": true,
-    "payable": false,
-    "type": "function",
-    "gas": "22405"
-  },
-  {
-    "name": "tokenByIndex",
-    "outputs": [
-      {
-        "type": "uint256",
-        "name": "out"
-      }
-    ],
-    "inputs": [
-      {
-        "type": "uint256",
-        "name": "_index"
-      }
-    ],
-    "constant": true,
-    "payable": false,
-    "type": "function",
-    "gas": "631"
-  },
-  {
-    "name": "tokenOfOwnerByIndex",
-    "outputs": [
-      {
-        "type": "uint256",
-        "name": "out"
-      }
-    ],
-    "inputs": [
-      {
-        "type": "address",
-        "name": "_owner"
-      },
-      {
-        "type": "uint256",
-        "name": "_index"
-      }
-    ],
-    "constant": true,
-    "payable": false,
-    "type": "function",
-    "gas": "1248"
-  },
-  {
-    "name": "transferFrom",
-    "outputs": [],
-    "inputs": [
-      {
-        "type": "address",
-        "name": "_from"
-      },
-      {
-        "type": "address",
-        "name": "_to"
-      },
-      {
-        "type": "uint256",
-        "name": "_tokenId"
-      }
-    ],
-    "constant": false,
-    "payable": false,
-    "type": "function",
-    "gas": "259486"
-  },
-  {
-    "name": "safeTransferFrom",
-    "outputs": [],
-    "inputs": [
-      {
-        "type": "address",
-        "name": "_from"
-      },
-      {
-        "type": "address",
-        "name": "_to"
-      },
-      {
-        "type": "uint256",
-        "name": "_tokenId"
-      }
-    ],
-    "constant": false,
-    "payable": false,
-    "type": "function"
-  },
-  {
-    "name": "safeTransferFrom",
-    "outputs": [],
-    "inputs": [
-      {
-        "type": "address",
-        "name": "_from"
-      },
-      {
-        "type": "address",
-        "name": "_to"
-      },
-      {
-        "type": "uint256",
-        "name": "_tokenId"
-      },
-      {
-        "type": "bytes",
-        "name": "_data"
-      }
-    ],
-    "constant": false,
-    "payable": false,
-    "type": "function"
-  },
-  {
-    "name": "approve",
-    "outputs": [],
-    "inputs": [
-      {
-        "type": "address",
-        "name": "_approved"
-      },
-      {
-        "type": "uint256",
-        "name": "_tokenId"
-      }
-    ],
-    "constant": false,
-    "payable": false,
-    "type": "function",
-    "gas": "38422"
-  },
-  {
-    "name": "setApprovalForAll",
-    "outputs": [],
-    "inputs": [
-      {
-        "type": "address",
-        "name": "_operator"
-      },
-      {
-        "type": "bool",
-        "name": "_approved"
-      }
-    ],
-    "constant": false,
-    "payable": false,
-    "type": "function",
-    "gas": "38016"
-  },
-  {
-    "name": "mint",
-    "outputs": [
-      {
-        "type": "bool",
-        "name": "out"
-      }
-    ],
-    "inputs": [
-      {
-        "type": "address",
-        "name": "_to"
-      }
-    ],
-    "constant": false,
-    "payable": false,
-    "type": "function",
-    "gas": "182636"
-  },
-  {
-    "name": "changeMinter",
-    "outputs": [],
-    "inputs": [
-      {
-        "type": "address",
-        "name": "_minter"
-      }
-    ],
-    "constant": false,
-    "payable": false,
-    "type": "function",
-    "gas": "35897"
-  },
-  {
-    "name": "changeURI",
-    "outputs": [],
-    "inputs": [
-      {
-        "type": "address",
-        "name": "_newURI"
-      }
-    ],
-    "constant": false,
-    "payable": false,
-    "type": "function",
-    "gas": "35927"
-  },
-  {
-    "name": "name",
-    "outputs": [
-      {
-        "type": "string",
-        "name": "out"
-      }
-    ],
-    "inputs": [],
-    "constant": true,
-    "payable": false,
-    "type": "function",
-    "gas": "6612"
-  },
-  {
-    "name": "symbol",
-    "outputs": [
-      {
-        "type": "string",
-        "name": "out"
-      }
-    ],
-    "inputs": [],
-    "constant": true,
-    "payable": false,
-    "type": "function",
-    "gas": "6642"
-  },
-  {
-    "name": "totalSupply",
-    "outputs": [
-      {
-        "type": "uint256",
-        "name": "out"
-      }
-    ],
-    "inputs": [],
-    "constant": true,
-    "payable": false,
-    "type": "function",
-    "gas": "873"
-  },
-  {
-    "name": "minter",
-    "outputs": [
-      {
-        "type": "address",
-        "name": "out"
-      }
-    ],
-    "inputs": [],
-    "constant": true,
-    "payable": false,
-    "type": "function",
-    "gas": "903"
-  },
-  {
-    "name": "socks",
-    "outputs": [
-      {
-        "type": "address",
-        "name": "out",
-        "unit": "Socks"
-      }
-    ],
-    "inputs": [],
-    "constant": true,
-    "payable": false,
-    "type": "function",
-    "gas": "933"
-  },
-  {
-    "name": "newURI",
-    "outputs": [
-      {
-        "type": "address",
-        "name": "out"
-      }
-    ],
-    "inputs": [],
-    "constant": true,
-    "payable": false,
-    "type": "function",
-    "gas": "963"
-  },
-  {
-    "name": "ownerOf",
-    "outputs": [
-      {
-        "type": "address",
-        "name": "out"
-      }
-    ],
-    "inputs": [
-      {
-        "type": "uint256",
-        "name": "arg0"
-      }
-    ],
-    "constant": true,
-    "payable": false,
-    "type": "function",
-    "gas": "1126"
-  },
-  {
-    "name": "balanceOf",
-    "outputs": [
-      {
-        "type": "uint256",
-        "name": "out"
-      }
-    ],
-    "inputs": [
-      {
-        "type": "address",
-        "name": "arg0"
-      }
-    ],
-    "constant": true,
-    "payable": false,
-    "type": "function",
-    "gas": "1195"
-  },
-  {
-    "name": "getApproved",
-    "outputs": [
-      {
-        "type": "address",
-        "name": "out"
-      }
-    ],
-    "inputs": [
-      {
-        "type": "uint256",
-        "name": "arg0"
-      }
-    ],
-    "constant": true,
-    "payable": false,
-    "type": "function",
-    "gas": "1186"
-  },
-  {
-    "name": "isApprovedForAll",
-    "outputs": [
-      {
-        "type": "bool",
-        "name": "out"
-      }
-    ],
-    "inputs": [
-      {
-        "type": "address",
-        "name": "arg0"
-      },
-      {
-        "type": "address",
-        "name": "arg1"
-      }
-    ],
-    "constant": true,
-    "payable": false,
-    "type": "function",
-    "gas": "1415"
-  },
-  {
-    "name": "supportsInterface",
-    "outputs": [
-      {
-        "type": "bool",
-        "name": "out"
-      }
-    ],
-    "inputs": [
-      {
-        "type": "bytes32",
-        "name": "arg0"
-      }
-    ],
-    "constant": true,
-    "payable": false,
-    "type": "function",
-    "gas": "1246"
-  }
-]
diff --git a/src/legacy/constants/index.ts b/src/legacy/constants/index.ts
index 1c6efdc606..27d348a583 100644
--- a/src/legacy/constants/index.ts
+++ b/src/legacy/constants/index.ts
@@ -1,8 +1,7 @@
+import { ethFlowBarnJson, ethFlowProdJson } from '@cowprotocol/abis'
 import networksJson from '@cowprotocol/contracts/networks.json'
 import { IpfsConfig } from '@cowprotocol/cow-sdk'
 import { SupportedChainId as ChainId } from '@cowprotocol/cow-sdk'
-import ethFlowBarnJson from '@cowprotocol/ethflowcontract/networks.barn.json'
-import ethFlowProdJson from '@cowprotocol/ethflowcontract/networks.prod.json'
 import { Token, Fraction, Percent } from '@uniswap/sdk-core'
 
 import BigNumber from 'bignumber.js'
diff --git a/src/legacy/hooks/useArgentWalletContract.ts b/src/legacy/hooks/useArgentWalletContract.ts
index f6426042b7..90f41c0938 100644
--- a/src/legacy/hooks/useArgentWalletContract.ts
+++ b/src/legacy/hooks/useArgentWalletContract.ts
@@ -1,5 +1,4 @@
-import ArgentWalletContractABI from 'legacy/abis/argent-wallet-contract.json'
-import { ArgentWalletContract } from 'legacy/abis/types'
+import { ArgentWalletContract, ArgentWalletContractAbi } from '@cowprotocol/abis'
 
 import { useWalletInfo } from 'modules/wallet'
 
@@ -11,7 +10,7 @@ export function useArgentWalletContract(): ArgentWalletContract | null {
   const isArgentWallet = useIsArgentWallet()
   return useContract(
     isArgentWallet ? account ?? undefined : undefined,
-    ArgentWalletContractABI,
+    ArgentWalletContractAbi,
     true
   ) as ArgentWalletContract
 }
diff --git a/src/legacy/hooks/useContract.ts b/src/legacy/hooks/useContract.ts
index 98f45631b3..0feb8aadd3 100644
--- a/src/legacy/hooks/useContract.ts
+++ b/src/legacy/hooks/useContract.ts
@@ -1,22 +1,36 @@
 import { useMemo } from 'react'
 
+import {
+  ArgentWalletDetector,
+  EnsPublicResolver,
+  EnsRegistrar,
+  Erc20,
+  Erc721,
+  Erc1155,
+  Weth,
+  CoWSwapEthFlowJson,
+  ArgentWalletDetectorAbi,
+  Eip2612Abi,
+  EnsPublicResolverAbi,
+  EnsAbi,
+  Erc20Abi,
+  Erc20Bytes32Abi,
+  Erc721Abi,
+  Erc1155Abi,
+  WethAbi,
+  GPv2Settlement,
+  GPv2SettlementAbi,
+  VCow,
+  CoWSwapEthFlow,
+  vCowAbi,
+  UniswapInterfaceMulticall,
+} from '@cowprotocol/abis'
 import { SupportedChainId } from '@cowprotocol/cow-sdk'
-import CoWSwapEthFlowJson from '@cowprotocol/ethflowcontract/artifacts/CoWSwapEthFlow.sol/CoWSwapEthFlow.json'
 import { Contract } from '@ethersproject/contracts'
 import type { JsonRpcProvider } from '@ethersproject/providers'
 import UniswapInterfaceMulticallJson from '@uniswap/v3-periphery/artifacts/contracts/lens/UniswapInterfaceMulticall.sol/UniswapInterfaceMulticall.json'
 import { useWeb3React } from '@web3-react/core'
 
-import ARGENT_WALLET_DETECTOR_ABI from 'legacy/abis/argent-wallet-detector.json'
-import EIP_2612 from 'legacy/abis/eip_2612.json'
-import ENS_PUBLIC_RESOLVER_ABI from 'legacy/abis/ens-public-resolver.json'
-import ENS_ABI from 'legacy/abis/ens-registrar.json'
-import ERC1155_ABI from 'legacy/abis/erc1155.json'
-import ERC20_ABI from 'legacy/abis/erc20.json'
-import ERC20_BYTES32_ABI from 'legacy/abis/erc20_bytes32.json'
-import ERC721_ABI from 'legacy/abis/erc721.json'
-import { ArgentWalletDetector, EnsPublicResolver, EnsRegistrar, Erc20, Erc721, Erc1155, Weth } from 'legacy/abis/types'
-import WETH_ABI from 'legacy/abis/weth.json'
 import {
   COWSWAP_ETHFLOW_CONTRACT_ADDRESS,
   GP_SETTLEMENT_CONTRACT_ADDRESS,
@@ -24,17 +38,11 @@ import {
 } from 'legacy/constants'
 import { ARGENT_WALLET_DETECTOR_ADDRESS, ENS_REGISTRAR_ADDRESSES, MULTICALL_ADDRESS } from 'legacy/constants/addresses'
 import { WRAPPED_NATIVE_CURRENCY } from 'legacy/constants/tokens'
-import { UniswapInterfaceMulticall } from 'legacy/types/v3'
 import { getContract } from 'legacy/utils'
 import { isEns, isProd, isStaging } from 'legacy/utils/environments'
 
 import { useWalletInfo } from 'modules/wallet'
 
-import GPv2_SETTLEMENT_ABI from 'abis/GPv2Settlement.json'
-import { GPv2Settlement, VCow } from 'abis/types'
-import { CoWSwapEthFlow } from 'abis/types/ethflow'
-import V_COW_ABI from 'abis/vCow.json'
-
 const { abi: MulticallABI } = UniswapInterfaceMulticallJson
 
 // returns null on errors
@@ -62,44 +70,44 @@ export function useContract<T extends Contract = Contract>(
 }
 
 export function useTokenContract(tokenAddress?: string, withSignerIfPossible?: boolean) {
-  return useContract<Erc20>(tokenAddress, ERC20_ABI, withSignerIfPossible)
+  return useContract<Erc20>(tokenAddress, Erc20Abi, withSignerIfPossible)
 }
 
 export function useWETHContract(withSignerIfPossible?: boolean) {
   const { chainId } = useWalletInfo()
   return useContract<Weth>(
     chainId ? WRAPPED_NATIVE_CURRENCY[chainId]?.address : undefined,
-    WETH_ABI,
+    WethAbi,
     withSignerIfPossible
   )
 }
 
 export function useERC721Contract(nftAddress?: string) {
-  return useContract<Erc721>(nftAddress, ERC721_ABI, false)
+  return useContract<Erc721>(nftAddress, Erc721Abi, false)
 }
 
 export function useERC1155Contract(nftAddress?: string) {
-  return useContract<Erc1155>(nftAddress, ERC1155_ABI, false)
+  return useContract<Erc1155>(nftAddress, Erc1155Abi, false)
 }
 
 export function useArgentWalletDetectorContract() {
-  return useContract<ArgentWalletDetector>(ARGENT_WALLET_DETECTOR_ADDRESS, ARGENT_WALLET_DETECTOR_ABI, false)
+  return useContract<ArgentWalletDetector>(ARGENT_WALLET_DETECTOR_ADDRESS, ArgentWalletDetectorAbi, false)
 }
 
 export function useENSRegistrarContract(withSignerIfPossible?: boolean) {
-  return useContract<EnsRegistrar>(ENS_REGISTRAR_ADDRESSES, ENS_ABI, withSignerIfPossible)
+  return useContract<EnsRegistrar>(ENS_REGISTRAR_ADDRESSES, EnsAbi, withSignerIfPossible)
 }
 
 export function useENSResolverContract(address: string | undefined, withSignerIfPossible?: boolean) {
-  return useContract<EnsPublicResolver>(address, ENS_PUBLIC_RESOLVER_ABI, withSignerIfPossible)
+  return useContract<EnsPublicResolver>(address, EnsPublicResolverAbi, withSignerIfPossible)
 }
 
 export function useBytes32TokenContract(tokenAddress?: string, withSignerIfPossible?: boolean): Contract | null {
-  return useContract(tokenAddress, ERC20_BYTES32_ABI, withSignerIfPossible)
+  return useContract(tokenAddress, Erc20Bytes32Abi, withSignerIfPossible)
 }
 
 export function useEIP2612Contract(tokenAddress?: string): Contract | null {
-  return useContract(tokenAddress, EIP_2612, false)
+  return useContract(tokenAddress, Eip2612Abi, false)
 }
 
 export function useInterfaceMulticall() {
@@ -122,14 +130,14 @@ export function useGP2SettlementContract(): GPv2Settlement | null {
   const { chainId } = useWalletInfo()
   return useContract<GPv2Settlement>(
     chainId ? GP_SETTLEMENT_CONTRACT_ADDRESS[chainId] : undefined,
-    GPv2_SETTLEMENT_ABI,
+    GPv2SettlementAbi,
     true
   )
 }
 
 export function useVCowContract() {
   const { chainId } = useWalletInfo()
-  return useContract<VCow>(chainId ? V_COW_CONTRACT_ADDRESS[chainId] : undefined, V_COW_ABI, true)
+  return useContract<VCow>(chainId ? V_COW_CONTRACT_ADDRESS[chainId] : undefined, vCowAbi, true)
 }
 
 /**
@@ -166,7 +174,7 @@ export function getTokenContract(
   account?: string,
   chainId?: SupportedChainId
 ): Erc20 | null {
-  return _getContract<Erc20>(tokenAddress, ERC20_ABI, withSignerIfPossible, provider, account, chainId)
+  return _getContract<Erc20>(tokenAddress, Erc20Abi, withSignerIfPossible, provider, account, chainId)
 }
 
 /**
@@ -179,5 +187,5 @@ export function getBytes32TokenContract(
   account?: string,
   chainId?: SupportedChainId
 ): Contract | null {
-  return _getContract(tokenAddress, ERC20_BYTES32_ABI, withSignerIfPossible, provider, account, chainId)
+  return _getContract(tokenAddress, Erc20Bytes32Abi, withSignerIfPossible, provider, account, chainId)
 }
diff --git a/src/legacy/hooks/useTokenLazy.ts b/src/legacy/hooks/useTokenLazy.ts
index 4291df8692..62dfb604c7 100644
--- a/src/legacy/hooks/useTokenLazy.ts
+++ b/src/legacy/hooks/useTokenLazy.ts
@@ -1,11 +1,11 @@
 import { useCallback } from 'react'
 
+import { Erc20 } from '@cowprotocol/abis'
 import { Contract } from '@ethersproject/contracts'
 import { JsonRpcProvider } from '@ethersproject/providers'
 import { Token } from '@uniswap/sdk-core'
 import { useWeb3React } from '@web3-react/core'
 
-import { Erc20 } from 'legacy/abis/types'
 import { getBytes32TokenContract, getTokenContract } from 'legacy/hooks/useContract'
 import { useAddUserToken } from 'legacy/state/user/hooks'
 import { retry } from 'legacy/utils/retry'
diff --git a/src/legacy/state/claim/hooks/index.ts b/src/legacy/state/claim/hooks/index.ts
index 2655234235..34368616a9 100644
--- a/src/legacy/state/claim/hooks/index.ts
+++ b/src/legacy/state/claim/hooks/index.ts
@@ -1,5 +1,6 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 
+import { VCow } from '@cowprotocol/abis'
 import { SupportedChainId as ChainId } from '@cowprotocol/cow-sdk'
 import { SupportedChainId } from '@cowprotocol/cow-sdk'
 import { BigNumber } from '@ethersproject/bignumber'
@@ -33,7 +34,6 @@ import { supportedChainId } from 'legacy/utils/supportedChainId'
 
 import { useWalletInfo } from 'modules/wallet'
 
-import { VCow as VCowType } from 'abis/types'
 import { useSingleContractMultipleData } from 'lib/hooks/multicall'
 import { EnhancedUserClaimData } from 'pages/Claim/types'
 import { formatTokenAmount } from 'utils/amountFormat'
@@ -277,7 +277,7 @@ export function useUserClaims(account: Account, optionalChainId?: SupportedChain
 }
 
 const FETCH_DEPLOYMENT_TIME_PROMISES: Map<ChainId, Promise<number>> = new Map()
-function fetchDeploymentTimestamp(vCowContract: VCowType, chainId: ChainId): Promise<number> {
+function fetchDeploymentTimestamp(vCowContract: VCow, chainId: ChainId): Promise<number> {
   let deploymentTimePromise = FETCH_DEPLOYMENT_TIME_PROMISES.get(chainId)
 
   if (!deploymentTimePromise) {
@@ -600,7 +600,7 @@ type GetClaimManyArgsParams = {
   nativeTokenPrice: string
 }
 
-type ClaimManyFnArgs = Parameters<VCowType['claimMany']>
+type ClaimManyFnArgs = Parameters<VCow['claimMany']>
 
 type GetClaimManyArgsResult = {
   args: ClaimManyFnArgs | undefined
diff --git a/src/legacy/state/orders/middleware/appziMiddleware.test.ts b/src/legacy/state/orders/middleware/appziMiddleware.test.ts
index d7cee50434..aca3231a30 100644
--- a/src/legacy/state/orders/middleware/appziMiddleware.test.ts
+++ b/src/legacy/state/orders/middleware/appziMiddleware.test.ts
@@ -1,5 +1,4 @@
 import { OrderClass } from '@cowprotocol/cow-sdk'
-import { getOrderByIdFromState } from '../helpers'
 
 import { AnyAction, Dispatch, MiddlewareAPI } from 'redux'
 import { instance, mock, resetCalls, when } from 'ts-mockito'
@@ -9,6 +8,7 @@ import { isOrderInPendingTooLong, openNpsAppziSometimes } from 'legacy/utils/app
 import { appziMiddleware } from './appziMiddleware'
 
 import { AppState } from '../../index'
+import { getOrderByIdFromState } from '../helpers'
 
 jest.mock('legacy/utils/appzi')
 jest.mock('../helpers', () => {
diff --git a/src/legacy/utils/approveAmountCalldata.ts b/src/legacy/utils/approveAmountCalldata.ts
index 3cf9a4d3d5..0b0692ccf3 100644
--- a/src/legacy/utils/approveAmountCalldata.ts
+++ b/src/legacy/utils/approveAmountCalldata.ts
@@ -1,9 +1,8 @@
+import type { Erc20Interface } from '@cowprotocol/abis'
 import { Interface } from '@ethersproject/abi'
 import { Currency, CurrencyAmount } from '@uniswap/sdk-core'
 import { toHex } from '@uniswap/v3-sdk'
 
-import { Erc20Interface } from 'legacy/abis/types/Erc20'
-
 const ERC20_INTERFACE = new Interface([
   {
     constant: false,
diff --git a/src/libs/abis/.eslintrc.json b/src/libs/abis/.eslintrc.json
new file mode 100644
index 0000000000..3456be9b90
--- /dev/null
+++ b/src/libs/abis/.eslintrc.json
@@ -0,0 +1,18 @@
+{
+  "extends": ["../../../.eslintrc.json"],
+  "ignorePatterns": ["!**/*"],
+  "overrides": [
+    {
+      "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
+      "rules": {}
+    },
+    {
+      "files": ["*.ts", "*.tsx"],
+      "rules": {}
+    },
+    {
+      "files": ["*.js", "*.jsx"],
+      "rules": {}
+    }
+  ]
+}
diff --git a/src/libs/abis/README.md b/src/libs/abis/README.md
new file mode 100644
index 0000000000..9bb542d2d3
--- /dev/null
+++ b/src/libs/abis/README.md
@@ -0,0 +1,23 @@
+# CoW Swap Abis
+
+Exports relevant ABIs )types and JSON)
+
+## Building
+
+Build the library (it won't re-generate the types)
+
+```bash
+nx build abis
+```
+
+## Re-generate ABIs types
+
+The types are automatically created from the Json ABIs.
+
+These generated types are commited into the project, and are not generated automatically (assumption is, we don't need to often add new ABIs and generation takes time).
+
+Geterate types:
+
+```bash
+nx abis abis
+```
diff --git a/src/libs/abis/jest.config.ts b/src/libs/abis/jest.config.ts
new file mode 100644
index 0000000000..486d721eea
--- /dev/null
+++ b/src/libs/abis/jest.config.ts
@@ -0,0 +1,10 @@
+/* eslint-disable */
+export default {
+  displayName: 'abis',
+  preset: '../../../jest.preset.js',
+  transform: {
+    '^.+\\.[tj]s$': ['ts-jest', { tsconfig: '<rootDir>/tsconfig.spec.json' }],
+  },
+  moduleFileExtensions: ['ts', 'js', 'html'],
+  coverageDirectory: '../../../coverage/src/libs/abis',
+}
diff --git a/src/libs/abis/package.json b/src/libs/abis/package.json
new file mode 100644
index 0000000000..c9305887a6
--- /dev/null
+++ b/src/libs/abis/package.json
@@ -0,0 +1,5 @@
+{
+  "name": "@cowprotocol/cowswap-abis",
+  "version": "0.0.1",
+  "type": "commonjs"
+}
diff --git a/src/libs/abis/project.json b/src/libs/abis/project.json
new file mode 100644
index 0000000000..b6f7f710d2
--- /dev/null
+++ b/src/libs/abis/project.json
@@ -0,0 +1,49 @@
+{
+  "name": "abis",
+  "$schema": "../../../node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "src/libs/abis/src",
+  "projectType": "library",
+  "targets": {
+    "abis": {
+      "executor": "nx:noop",
+      "dependsOn": ["abi:ethflow", "abi:custom", "abis-legacy"]
+    },
+    "abi:ethflow": {
+      "executor": "nx:run-commands",
+      "options": {
+        "command": "typechain --target ethers-v5 --out-dir ./src/libs/abis/src/generated/ethflow \"./src/libs/abis/node_modules/@cowprotocol/ethflowcontract/artifacts/CoWSwapEthFlow.sol/*.json\""
+      }
+    },
+    "abi:custom": {
+      "executor": "nx:run-commands",
+      "options": {
+        "command": "typechain --target ethers-v5 --out-dir ./src/libs/abis/src/generated/custom './src/libs/abis/src/abis/**/*.json'"
+      }
+    },
+    "abis-legacy": {
+      "executor": "nx:run-commands",
+      "options": {
+        "command": "typechain --target ethers-v5 --out-dir ./src/libs/abis/src/generated/legacy './src/libs/abis/src/abis-legacy/**/*.json'"
+      }
+    },
+    "build": {
+      "executor": "@nx/vite:build",
+      "outputs": ["{options.outputPath}"],
+      "options": {
+        "outputPath": "dist/libs/abis"
+      }
+    },
+    "publish": {
+      "command": "node tools/scripts/publish.mjs abis {args.ver} {args.tag}",
+      "dependsOn": ["build"]
+    },
+    "lint": {
+      "executor": "@nx/linter:eslint",
+      "outputs": ["{options.outputFile}"],
+      "options": {
+        "lintFilePatterns": ["src/libs/abis/**/*.ts"]
+      }
+    }
+  },
+  "tags": []
+}
diff --git a/src/libs/abis/src/abis-legacy/UniswapInterfaceMulticall.json b/src/libs/abis/src/abis-legacy/UniswapInterfaceMulticall.json
new file mode 100644
index 0000000000..5c23d9d0c5
--- /dev/null
+++ b/src/libs/abis/src/abis-legacy/UniswapInterfaceMulticall.json
@@ -0,0 +1,101 @@
+{
+  "_format": "hh-sol-artifact-1",
+  "contractName": "UniswapInterfaceMulticall",
+  "sourceName": "contracts/lens/UniswapInterfaceMulticall.sol",
+  "abi": [
+    {
+      "inputs": [],
+      "name": "getCurrentBlockTimestamp",
+      "outputs": [
+        {
+          "internalType": "uint256",
+          "name": "timestamp",
+          "type": "uint256"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "addr",
+          "type": "address"
+        }
+      ],
+      "name": "getEthBalance",
+      "outputs": [
+        {
+          "internalType": "uint256",
+          "name": "balance",
+          "type": "uint256"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "components": [
+            {
+              "internalType": "address",
+              "name": "target",
+              "type": "address"
+            },
+            {
+              "internalType": "uint256",
+              "name": "gasLimit",
+              "type": "uint256"
+            },
+            {
+              "internalType": "bytes",
+              "name": "callData",
+              "type": "bytes"
+            }
+          ],
+          "internalType": "struct UniswapInterfaceMulticall.Call[]",
+          "name": "calls",
+          "type": "tuple[]"
+        }
+      ],
+      "name": "multicall",
+      "outputs": [
+        {
+          "internalType": "uint256",
+          "name": "blockNumber",
+          "type": "uint256"
+        },
+        {
+          "components": [
+            {
+              "internalType": "bool",
+              "name": "success",
+              "type": "bool"
+            },
+            {
+              "internalType": "uint256",
+              "name": "gasUsed",
+              "type": "uint256"
+            },
+            {
+              "internalType": "bytes",
+              "name": "returnData",
+              "type": "bytes"
+            }
+          ],
+          "internalType": "struct UniswapInterfaceMulticall.Result[]",
+          "name": "returnData",
+          "type": "tuple[]"
+        }
+      ],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    }
+  ],
+  "bytecode": "0x608060405234801561001057600080fd5b50610567806100206000396000f3fe608060405234801561001057600080fd5b50600436106100415760003560e01c80630f28c97d146100465780631749e1e3146100645780634d2301cc14610085575b600080fd5b61004e610098565b60405161005b919061041f565b60405180910390f35b6100776100723660046102a7565b61009c565b60405161005b929190610428565b61004e610093366004610286565b610220565b4290565b8051439060609067ffffffffffffffff811180156100b957600080fd5b506040519080825280602002602001820160405280156100f357816020015b6100e061023a565b8152602001906001900390816100d85790505b50905060005b835181101561021a57600080600086848151811061011357fe5b60200260200101516000015187858151811061012b57fe5b60200260200101516020015188868151811061014357fe5b60200260200101516040015192509250925060005a90506000808573ffffffffffffffffffffffffffffffffffffffff1685856040516101839190610403565b60006040518083038160008787f1925050503d80600081146101c1576040519150601f19603f3d011682016040523d82523d6000602084013e6101c6565b606091505b509150915060005a8403905060405180606001604052808415158152602001828152602001838152508989815181106101fb57fe5b60200260200101819052505050505050505080806001019150506100f9565b50915091565b73ffffffffffffffffffffffffffffffffffffffff163190565b604051806060016040528060001515815260200160008152602001606081525090565b803573ffffffffffffffffffffffffffffffffffffffff8116811461028157600080fd5b919050565b600060208284031215610297578081fd5b6102a08261025d565b9392505050565b600060208083850312156102b9578182fd5b823567ffffffffffffffff808211156102d0578384fd5b818501915085601f8301126102e3578384fd5b8135818111156102ef57fe5b6102fc8485830201610506565b81815284810190848601875b848110156103f457813587017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0606081838f03011215610346578a8bfd5b60408051606081018181108b8211171561035c57fe5b8252610369848d0161025d565b8152818401358c82015260608401358a811115610384578d8efd5b8085019450508e603f850112610398578c8dfd5b8b8401358a8111156103a657fe5b6103b68d85601f84011601610506565b93508084528f838287010111156103cb578d8efd5b808386018e86013783018c018d9052908101919091528552509287019290870190600101610308565b50909998505050505050505050565b6000825161041581846020870161052a565b9190910192915050565b90815260200190565b600060408083018584526020828186015281865180845260609350838701915083838202880101838901875b838110156104f6578983037fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa001855281518051151584528681015187850152880151888401889052805188850181905260806104b582828801858c0161052a565b96880196601f919091017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe01694909401909301925090850190600101610454565b50909a9950505050505050505050565b60405181810167ffffffffffffffff8111828210171561052257fe5b604052919050565b60005b8381101561054557818101518382015260200161052d565b83811115610554576000848401525b5050505056fea164736f6c6343000706000a",
+  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100415760003560e01c80630f28c97d146100465780631749e1e3146100645780634d2301cc14610085575b600080fd5b61004e610098565b60405161005b919061041f565b60405180910390f35b6100776100723660046102a7565b61009c565b60405161005b929190610428565b61004e610093366004610286565b610220565b4290565b8051439060609067ffffffffffffffff811180156100b957600080fd5b506040519080825280602002602001820160405280156100f357816020015b6100e061023a565b8152602001906001900390816100d85790505b50905060005b835181101561021a57600080600086848151811061011357fe5b60200260200101516000015187858151811061012b57fe5b60200260200101516020015188868151811061014357fe5b60200260200101516040015192509250925060005a90506000808573ffffffffffffffffffffffffffffffffffffffff1685856040516101839190610403565b60006040518083038160008787f1925050503d80600081146101c1576040519150601f19603f3d011682016040523d82523d6000602084013e6101c6565b606091505b509150915060005a8403905060405180606001604052808415158152602001828152602001838152508989815181106101fb57fe5b60200260200101819052505050505050505080806001019150506100f9565b50915091565b73ffffffffffffffffffffffffffffffffffffffff163190565b604051806060016040528060001515815260200160008152602001606081525090565b803573ffffffffffffffffffffffffffffffffffffffff8116811461028157600080fd5b919050565b600060208284031215610297578081fd5b6102a08261025d565b9392505050565b600060208083850312156102b9578182fd5b823567ffffffffffffffff808211156102d0578384fd5b818501915085601f8301126102e3578384fd5b8135818111156102ef57fe5b6102fc8485830201610506565b81815284810190848601875b848110156103f457813587017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0606081838f03011215610346578a8bfd5b60408051606081018181108b8211171561035c57fe5b8252610369848d0161025d565b8152818401358c82015260608401358a811115610384578d8efd5b8085019450508e603f850112610398578c8dfd5b8b8401358a8111156103a657fe5b6103b68d85601f84011601610506565b93508084528f838287010111156103cb578d8efd5b808386018e86013783018c018d9052908101919091528552509287019290870190600101610308565b50909998505050505050505050565b6000825161041581846020870161052a565b9190910192915050565b90815260200190565b600060408083018584526020828186015281865180845260609350838701915083838202880101838901875b838110156104f6578983037fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa001855281518051151584528681015187850152880151888401889052805188850181905260806104b582828801858c0161052a565b96880196601f919091017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe01694909401909301925090850190600101610454565b50909a9950505050505050505050565b60405181810167ffffffffffffffff8111828210171561052257fe5b604052919050565b60005b8381101561054557818101518382015260200161052d565b83811115610554576000848401525b5050505056fea164736f6c6343000706000a",
+  "linkReferences": {},
+  "deployedLinkReferences": {}
+}
diff --git a/src/legacy/abis/argent-wallet-contract.json b/src/libs/abis/src/abis-legacy/argent-wallet-contract.json
similarity index 100%
rename from src/legacy/abis/argent-wallet-contract.json
rename to src/libs/abis/src/abis-legacy/argent-wallet-contract.json
diff --git a/src/legacy/abis/argent-wallet-detector.json b/src/libs/abis/src/abis-legacy/argent-wallet-detector.json
similarity index 100%
rename from src/legacy/abis/argent-wallet-detector.json
rename to src/libs/abis/src/abis-legacy/argent-wallet-detector.json
diff --git a/src/legacy/abis/eip_2612.json b/src/libs/abis/src/abis-legacy/eip_2612.json
similarity index 100%
rename from src/legacy/abis/eip_2612.json
rename to src/libs/abis/src/abis-legacy/eip_2612.json
diff --git a/src/legacy/abis/ens-public-resolver.json b/src/libs/abis/src/abis-legacy/ens-public-resolver.json
similarity index 100%
rename from src/legacy/abis/ens-public-resolver.json
rename to src/libs/abis/src/abis-legacy/ens-public-resolver.json
diff --git a/src/legacy/abis/ens-registrar.json b/src/libs/abis/src/abis-legacy/ens-registrar.json
similarity index 100%
rename from src/legacy/abis/ens-registrar.json
rename to src/libs/abis/src/abis-legacy/ens-registrar.json
diff --git a/src/legacy/abis/erc1155.json b/src/libs/abis/src/abis-legacy/erc1155.json
similarity index 100%
rename from src/legacy/abis/erc1155.json
rename to src/libs/abis/src/abis-legacy/erc1155.json
diff --git a/src/legacy/abis/erc20.json b/src/libs/abis/src/abis-legacy/erc20.json
similarity index 100%
rename from src/legacy/abis/erc20.json
rename to src/libs/abis/src/abis-legacy/erc20.json
diff --git a/src/legacy/abis/erc20_bytes32.json b/src/libs/abis/src/abis-legacy/erc20_bytes32.json
similarity index 100%
rename from src/legacy/abis/erc20_bytes32.json
rename to src/libs/abis/src/abis-legacy/erc20_bytes32.json
diff --git a/src/legacy/abis/erc721.json b/src/libs/abis/src/abis-legacy/erc721.json
similarity index 100%
rename from src/legacy/abis/erc721.json
rename to src/libs/abis/src/abis-legacy/erc721.json
diff --git a/src/legacy/abis/weth.json b/src/libs/abis/src/abis-legacy/weth.json
similarity index 100%
rename from src/legacy/abis/weth.json
rename to src/libs/abis/src/abis-legacy/weth.json
diff --git a/src/abis/ComposableCoW.json b/src/libs/abis/src/abis/ComposableCoW.json
similarity index 100%
rename from src/abis/ComposableCoW.json
rename to src/libs/abis/src/abis/ComposableCoW.json
diff --git a/src/abis/ExtensibleFallbackHandler.json b/src/libs/abis/src/abis/ExtensibleFallbackHandler.json
similarity index 100%
rename from src/abis/ExtensibleFallbackHandler.json
rename to src/libs/abis/src/abis/ExtensibleFallbackHandler.json
diff --git a/src/abis/GPv2Settlement.json b/src/libs/abis/src/abis/GPv2Settlement.json
similarity index 100%
rename from src/abis/GPv2Settlement.json
rename to src/libs/abis/src/abis/GPv2Settlement.json
diff --git a/src/abis/MerkleDrop.json b/src/libs/abis/src/abis/MerkleDrop.json
similarity index 100%
rename from src/abis/MerkleDrop.json
rename to src/libs/abis/src/abis/MerkleDrop.json
diff --git a/src/abis/SignatureVerifierMuxer.json b/src/libs/abis/src/abis/SignatureVerifierMuxer.json
similarity index 100%
rename from src/abis/SignatureVerifierMuxer.json
rename to src/libs/abis/src/abis/SignatureVerifierMuxer.json
diff --git a/src/abis/TokenDistro.json b/src/libs/abis/src/abis/TokenDistro.json
similarity index 100%
rename from src/abis/TokenDistro.json
rename to src/libs/abis/src/abis/TokenDistro.json
diff --git a/src/abis/vCow.json b/src/libs/abis/src/abis/vCow.json
similarity index 100%
rename from src/abis/vCow.json
rename to src/libs/abis/src/abis/vCow.json
diff --git a/src/libs/abis/src/generated/custom/ComposableCoW.ts b/src/libs/abis/src/generated/custom/ComposableCoW.ts
new file mode 100644
index 0000000000..a14d118af6
--- /dev/null
+++ b/src/libs/abis/src/generated/custom/ComposableCoW.ts
@@ -0,0 +1,301 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+import type {
+  BaseContract,
+  BigNumber,
+  BigNumberish,
+  BytesLike,
+  CallOverrides,
+  ContractTransaction,
+  Overrides,
+  PopulatedTransaction,
+  Signer,
+  utils,
+} from 'ethers'
+import type { FunctionFragment, Result } from '@ethersproject/abi'
+import type { Listener, Provider } from '@ethersproject/providers'
+import type { TypedEventFilter, TypedEvent, TypedListener, OnEvent, PromiseOrValue } from './common'
+
+export declare namespace IConditionalOrder {
+  export type ConditionalOrderParamsStruct = {
+    handler: PromiseOrValue<string>
+    salt: PromiseOrValue<BytesLike>
+    staticInput: PromiseOrValue<BytesLike>
+  }
+
+  export type ConditionalOrderParamsStructOutput = [string, string, string] & {
+    handler: string
+    salt: string
+    staticInput: string
+  }
+}
+
+export declare namespace GPv2Order {
+  export type DataStruct = {
+    sellToken: PromiseOrValue<string>
+    buyToken: PromiseOrValue<string>
+    receiver: PromiseOrValue<string>
+    sellAmount: PromiseOrValue<BigNumberish>
+    buyAmount: PromiseOrValue<BigNumberish>
+    validTo: PromiseOrValue<BigNumberish>
+    appData: PromiseOrValue<BytesLike>
+    feeAmount: PromiseOrValue<BigNumberish>
+    kind: PromiseOrValue<BytesLike>
+    partiallyFillable: PromiseOrValue<boolean>
+    sellTokenBalance: PromiseOrValue<BytesLike>
+    buyTokenBalance: PromiseOrValue<BytesLike>
+  }
+
+  export type DataStructOutput = [
+    string,
+    string,
+    string,
+    BigNumber,
+    BigNumber,
+    number,
+    string,
+    BigNumber,
+    string,
+    boolean,
+    string,
+    string
+  ] & {
+    sellToken: string
+    buyToken: string
+    receiver: string
+    sellAmount: BigNumber
+    buyAmount: BigNumber
+    validTo: number
+    appData: string
+    feeAmount: BigNumber
+    kind: string
+    partiallyFillable: boolean
+    sellTokenBalance: string
+    buyTokenBalance: string
+  }
+}
+
+export interface ComposableCoWInterface extends utils.Interface {
+  functions: {
+    'createWithContext((address,bytes32,bytes),address,bytes,bool)': FunctionFragment
+    'singleOrders(address,bytes32)': FunctionFragment
+    'getTradeableOrderWithSignature(address,(address,bytes32,bytes),bytes,bytes32[])': FunctionFragment
+    'remove(bytes32)': FunctionFragment
+  }
+
+  getFunction(
+    nameOrSignatureOrTopic: 'createWithContext' | 'singleOrders' | 'getTradeableOrderWithSignature' | 'remove'
+  ): FunctionFragment
+
+  encodeFunctionData(
+    functionFragment: 'createWithContext',
+    values: [
+      IConditionalOrder.ConditionalOrderParamsStruct,
+      PromiseOrValue<string>,
+      PromiseOrValue<BytesLike>,
+      PromiseOrValue<boolean>
+    ]
+  ): string
+  encodeFunctionData(
+    functionFragment: 'singleOrders',
+    values: [PromiseOrValue<string>, PromiseOrValue<BytesLike>]
+  ): string
+  encodeFunctionData(
+    functionFragment: 'getTradeableOrderWithSignature',
+    values: [
+      PromiseOrValue<string>,
+      IConditionalOrder.ConditionalOrderParamsStruct,
+      PromiseOrValue<BytesLike>,
+      PromiseOrValue<BytesLike>[]
+    ]
+  ): string
+  encodeFunctionData(functionFragment: 'remove', values: [PromiseOrValue<BytesLike>]): string
+
+  decodeFunctionResult(functionFragment: 'createWithContext', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'singleOrders', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'getTradeableOrderWithSignature', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'remove', data: BytesLike): Result
+
+  events: {}
+}
+
+export interface ComposableCoW extends BaseContract {
+  connect(signerOrProvider: Signer | Provider | string): this
+  attach(addressOrName: string): this
+  deployed(): Promise<this>
+
+  interface: ComposableCoWInterface
+
+  queryFilter<TEvent extends TypedEvent>(
+    event: TypedEventFilter<TEvent>,
+    fromBlockOrBlockhash?: string | number | undefined,
+    toBlock?: string | number | undefined
+  ): Promise<Array<TEvent>>
+
+  listeners<TEvent extends TypedEvent>(eventFilter?: TypedEventFilter<TEvent>): Array<TypedListener<TEvent>>
+  listeners(eventName?: string): Array<Listener>
+  removeAllListeners<TEvent extends TypedEvent>(eventFilter: TypedEventFilter<TEvent>): this
+  removeAllListeners(eventName?: string): this
+  off: OnEvent<this>
+  on: OnEvent<this>
+  once: OnEvent<this>
+  removeListener: OnEvent<this>
+
+  functions: {
+    createWithContext(
+      params: IConditionalOrder.ConditionalOrderParamsStruct,
+      factory: PromiseOrValue<string>,
+      data: PromiseOrValue<BytesLike>,
+      dispatch: PromiseOrValue<boolean>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<ContractTransaction>
+
+    singleOrders(
+      safe: PromiseOrValue<string>,
+      singleOrderHash: PromiseOrValue<BytesLike>,
+      overrides?: CallOverrides
+    ): Promise<[boolean]>
+
+    getTradeableOrderWithSignature(
+      owner: PromiseOrValue<string>,
+      params: IConditionalOrder.ConditionalOrderParamsStruct,
+      offchainInput: PromiseOrValue<BytesLike>,
+      proof: PromiseOrValue<BytesLike>[],
+      overrides?: CallOverrides
+    ): Promise<
+      [GPv2Order.DataStructOutput, string] & {
+        order: GPv2Order.DataStructOutput
+        signature: string
+      }
+    >
+
+    remove(
+      singleOrderHash: PromiseOrValue<BytesLike>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<ContractTransaction>
+  }
+
+  createWithContext(
+    params: IConditionalOrder.ConditionalOrderParamsStruct,
+    factory: PromiseOrValue<string>,
+    data: PromiseOrValue<BytesLike>,
+    dispatch: PromiseOrValue<boolean>,
+    overrides?: Overrides & { from?: PromiseOrValue<string> }
+  ): Promise<ContractTransaction>
+
+  singleOrders(
+    safe: PromiseOrValue<string>,
+    singleOrderHash: PromiseOrValue<BytesLike>,
+    overrides?: CallOverrides
+  ): Promise<boolean>
+
+  getTradeableOrderWithSignature(
+    owner: PromiseOrValue<string>,
+    params: IConditionalOrder.ConditionalOrderParamsStruct,
+    offchainInput: PromiseOrValue<BytesLike>,
+    proof: PromiseOrValue<BytesLike>[],
+    overrides?: CallOverrides
+  ): Promise<
+    [GPv2Order.DataStructOutput, string] & {
+      order: GPv2Order.DataStructOutput
+      signature: string
+    }
+  >
+
+  remove(
+    singleOrderHash: PromiseOrValue<BytesLike>,
+    overrides?: Overrides & { from?: PromiseOrValue<string> }
+  ): Promise<ContractTransaction>
+
+  callStatic: {
+    createWithContext(
+      params: IConditionalOrder.ConditionalOrderParamsStruct,
+      factory: PromiseOrValue<string>,
+      data: PromiseOrValue<BytesLike>,
+      dispatch: PromiseOrValue<boolean>,
+      overrides?: CallOverrides
+    ): Promise<void>
+
+    singleOrders(
+      safe: PromiseOrValue<string>,
+      singleOrderHash: PromiseOrValue<BytesLike>,
+      overrides?: CallOverrides
+    ): Promise<boolean>
+
+    getTradeableOrderWithSignature(
+      owner: PromiseOrValue<string>,
+      params: IConditionalOrder.ConditionalOrderParamsStruct,
+      offchainInput: PromiseOrValue<BytesLike>,
+      proof: PromiseOrValue<BytesLike>[],
+      overrides?: CallOverrides
+    ): Promise<
+      [GPv2Order.DataStructOutput, string] & {
+        order: GPv2Order.DataStructOutput
+        signature: string
+      }
+    >
+
+    remove(singleOrderHash: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<void>
+  }
+
+  filters: {}
+
+  estimateGas: {
+    createWithContext(
+      params: IConditionalOrder.ConditionalOrderParamsStruct,
+      factory: PromiseOrValue<string>,
+      data: PromiseOrValue<BytesLike>,
+      dispatch: PromiseOrValue<boolean>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<BigNumber>
+
+    singleOrders(
+      safe: PromiseOrValue<string>,
+      singleOrderHash: PromiseOrValue<BytesLike>,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>
+
+    getTradeableOrderWithSignature(
+      owner: PromiseOrValue<string>,
+      params: IConditionalOrder.ConditionalOrderParamsStruct,
+      offchainInput: PromiseOrValue<BytesLike>,
+      proof: PromiseOrValue<BytesLike>[],
+      overrides?: CallOverrides
+    ): Promise<BigNumber>
+
+    remove(
+      singleOrderHash: PromiseOrValue<BytesLike>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<BigNumber>
+  }
+
+  populateTransaction: {
+    createWithContext(
+      params: IConditionalOrder.ConditionalOrderParamsStruct,
+      factory: PromiseOrValue<string>,
+      data: PromiseOrValue<BytesLike>,
+      dispatch: PromiseOrValue<boolean>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<PopulatedTransaction>
+
+    singleOrders(
+      safe: PromiseOrValue<string>,
+      singleOrderHash: PromiseOrValue<BytesLike>,
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>
+
+    getTradeableOrderWithSignature(
+      owner: PromiseOrValue<string>,
+      params: IConditionalOrder.ConditionalOrderParamsStruct,
+      offchainInput: PromiseOrValue<BytesLike>,
+      proof: PromiseOrValue<BytesLike>[],
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>
+
+    remove(
+      singleOrderHash: PromiseOrValue<BytesLike>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<PopulatedTransaction>
+  }
+}
diff --git a/src/libs/abis/src/generated/custom/ExtensibleFallbackHandler.ts b/src/libs/abis/src/generated/custom/ExtensibleFallbackHandler.ts
new file mode 100644
index 0000000000..5db765dc3a
--- /dev/null
+++ b/src/libs/abis/src/generated/custom/ExtensibleFallbackHandler.ts
@@ -0,0 +1,208 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+import type {
+  BaseContract,
+  BigNumber,
+  BytesLike,
+  CallOverrides,
+  ContractTransaction,
+  Overrides,
+  PopulatedTransaction,
+  Signer,
+  utils,
+} from 'ethers'
+import type { FunctionFragment, Result, EventFragment } from '@ethersproject/abi'
+import type { Listener, Provider } from '@ethersproject/providers'
+import type { TypedEventFilter, TypedEvent, TypedListener, OnEvent, PromiseOrValue } from './common'
+
+export interface ExtensibleFallbackHandlerInterface extends utils.Interface {
+  functions: {
+    'setDefaultFallbackHandler(address)': FunctionFragment
+    'setSafeMethod(bytes4,address)': FunctionFragment
+  }
+
+  getFunction(nameOrSignatureOrTopic: 'setDefaultFallbackHandler' | 'setSafeMethod'): FunctionFragment
+
+  encodeFunctionData(functionFragment: 'setDefaultFallbackHandler', values: [PromiseOrValue<string>]): string
+  encodeFunctionData(
+    functionFragment: 'setSafeMethod',
+    values: [PromiseOrValue<BytesLike>, PromiseOrValue<string>]
+  ): string
+
+  decodeFunctionResult(functionFragment: 'setDefaultFallbackHandler', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'setSafeMethod', data: BytesLike): Result
+
+  events: {
+    'AddedSafeMethod(address,bytes4,address)': EventFragment
+    'ChangedDefaultFallbackHandler(address,address,address)': EventFragment
+    'ChangedSafeMethod(address,bytes4,address,address)': EventFragment
+    'RemovedSafeMethod(address,bytes4)': EventFragment
+  }
+
+  getEvent(nameOrSignatureOrTopic: 'AddedSafeMethod'): EventFragment
+  getEvent(nameOrSignatureOrTopic: 'ChangedDefaultFallbackHandler'): EventFragment
+  getEvent(nameOrSignatureOrTopic: 'ChangedSafeMethod'): EventFragment
+  getEvent(nameOrSignatureOrTopic: 'RemovedSafeMethod'): EventFragment
+}
+
+export interface AddedSafeMethodEventObject {
+  safe: string
+  selector: string
+  handler: string
+}
+export type AddedSafeMethodEvent = TypedEvent<[string, string, string], AddedSafeMethodEventObject>
+
+export type AddedSafeMethodEventFilter = TypedEventFilter<AddedSafeMethodEvent>
+
+export interface ChangedDefaultFallbackHandlerEventObject {
+  safe: string
+  oldHandler: string
+  newHandler: string
+}
+export type ChangedDefaultFallbackHandlerEvent = TypedEvent<
+  [string, string, string],
+  ChangedDefaultFallbackHandlerEventObject
+>
+
+export type ChangedDefaultFallbackHandlerEventFilter = TypedEventFilter<ChangedDefaultFallbackHandlerEvent>
+
+export interface ChangedSafeMethodEventObject {
+  safe: string
+  selector: string
+  oldHandler: string
+  newHandler: string
+}
+export type ChangedSafeMethodEvent = TypedEvent<[string, string, string, string], ChangedSafeMethodEventObject>
+
+export type ChangedSafeMethodEventFilter = TypedEventFilter<ChangedSafeMethodEvent>
+
+export interface RemovedSafeMethodEventObject {
+  safe: string
+  selector: string
+}
+export type RemovedSafeMethodEvent = TypedEvent<[string, string], RemovedSafeMethodEventObject>
+
+export type RemovedSafeMethodEventFilter = TypedEventFilter<RemovedSafeMethodEvent>
+
+export interface ExtensibleFallbackHandler extends BaseContract {
+  connect(signerOrProvider: Signer | Provider | string): this
+  attach(addressOrName: string): this
+  deployed(): Promise<this>
+
+  interface: ExtensibleFallbackHandlerInterface
+
+  queryFilter<TEvent extends TypedEvent>(
+    event: TypedEventFilter<TEvent>,
+    fromBlockOrBlockhash?: string | number | undefined,
+    toBlock?: string | number | undefined
+  ): Promise<Array<TEvent>>
+
+  listeners<TEvent extends TypedEvent>(eventFilter?: TypedEventFilter<TEvent>): Array<TypedListener<TEvent>>
+  listeners(eventName?: string): Array<Listener>
+  removeAllListeners<TEvent extends TypedEvent>(eventFilter: TypedEventFilter<TEvent>): this
+  removeAllListeners(eventName?: string): this
+  off: OnEvent<this>
+  on: OnEvent<this>
+  once: OnEvent<this>
+  removeListener: OnEvent<this>
+
+  functions: {
+    setDefaultFallbackHandler(
+      newHandler: PromiseOrValue<string>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<ContractTransaction>
+
+    setSafeMethod(
+      selector: PromiseOrValue<BytesLike>,
+      newHandler: PromiseOrValue<string>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<ContractTransaction>
+  }
+
+  setDefaultFallbackHandler(
+    newHandler: PromiseOrValue<string>,
+    overrides?: Overrides & { from?: PromiseOrValue<string> }
+  ): Promise<ContractTransaction>
+
+  setSafeMethod(
+    selector: PromiseOrValue<BytesLike>,
+    newHandler: PromiseOrValue<string>,
+    overrides?: Overrides & { from?: PromiseOrValue<string> }
+  ): Promise<ContractTransaction>
+
+  callStatic: {
+    setDefaultFallbackHandler(newHandler: PromiseOrValue<string>, overrides?: CallOverrides): Promise<void>
+
+    setSafeMethod(
+      selector: PromiseOrValue<BytesLike>,
+      newHandler: PromiseOrValue<string>,
+      overrides?: CallOverrides
+    ): Promise<void>
+  }
+
+  filters: {
+    'AddedSafeMethod(address,bytes4,address)'(
+      safe?: PromiseOrValue<string> | null,
+      selector?: null,
+      handler?: null
+    ): AddedSafeMethodEventFilter
+    AddedSafeMethod(safe?: PromiseOrValue<string> | null, selector?: null, handler?: null): AddedSafeMethodEventFilter
+
+    'ChangedDefaultFallbackHandler(address,address,address)'(
+      safe?: PromiseOrValue<string> | null,
+      oldHandler?: null,
+      newHandler?: null
+    ): ChangedDefaultFallbackHandlerEventFilter
+    ChangedDefaultFallbackHandler(
+      safe?: PromiseOrValue<string> | null,
+      oldHandler?: null,
+      newHandler?: null
+    ): ChangedDefaultFallbackHandlerEventFilter
+
+    'ChangedSafeMethod(address,bytes4,address,address)'(
+      safe?: PromiseOrValue<string> | null,
+      selector?: null,
+      oldHandler?: null,
+      newHandler?: null
+    ): ChangedSafeMethodEventFilter
+    ChangedSafeMethod(
+      safe?: PromiseOrValue<string> | null,
+      selector?: null,
+      oldHandler?: null,
+      newHandler?: null
+    ): ChangedSafeMethodEventFilter
+
+    'RemovedSafeMethod(address,bytes4)'(
+      safe?: PromiseOrValue<string> | null,
+      selector?: null
+    ): RemovedSafeMethodEventFilter
+    RemovedSafeMethod(safe?: PromiseOrValue<string> | null, selector?: null): RemovedSafeMethodEventFilter
+  }
+
+  estimateGas: {
+    setDefaultFallbackHandler(
+      newHandler: PromiseOrValue<string>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<BigNumber>
+
+    setSafeMethod(
+      selector: PromiseOrValue<BytesLike>,
+      newHandler: PromiseOrValue<string>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<BigNumber>
+  }
+
+  populateTransaction: {
+    setDefaultFallbackHandler(
+      newHandler: PromiseOrValue<string>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<PopulatedTransaction>
+
+    setSafeMethod(
+      selector: PromiseOrValue<BytesLike>,
+      newHandler: PromiseOrValue<string>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<PopulatedTransaction>
+  }
+}
diff --git a/src/libs/abis/src/generated/custom/GPv2Settlement.ts b/src/libs/abis/src/generated/custom/GPv2Settlement.ts
new file mode 100644
index 0000000000..36f45b50fc
--- /dev/null
+++ b/src/libs/abis/src/generated/custom/GPv2Settlement.ts
@@ -0,0 +1,171 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+import type {
+  BaseContract,
+  BigNumber,
+  BytesLike,
+  CallOverrides,
+  ContractTransaction,
+  Overrides,
+  PopulatedTransaction,
+  Signer,
+  utils,
+} from 'ethers'
+import type { FunctionFragment, Result, EventFragment } from '@ethersproject/abi'
+import type { Listener, Provider } from '@ethersproject/providers'
+import type { TypedEventFilter, TypedEvent, TypedListener, OnEvent, PromiseOrValue } from './common'
+
+export interface GPv2SettlementInterface extends utils.Interface {
+  functions: {
+    'setPreSignature(bytes,bool)': FunctionFragment
+    'invalidateOrder(bytes)': FunctionFragment
+    'domainSeparator()': FunctionFragment
+  }
+
+  getFunction(nameOrSignatureOrTopic: 'setPreSignature' | 'invalidateOrder' | 'domainSeparator'): FunctionFragment
+
+  encodeFunctionData(
+    functionFragment: 'setPreSignature',
+    values: [PromiseOrValue<BytesLike>, PromiseOrValue<boolean>]
+  ): string
+  encodeFunctionData(functionFragment: 'invalidateOrder', values: [PromiseOrValue<BytesLike>]): string
+  encodeFunctionData(functionFragment: 'domainSeparator', values?: undefined): string
+
+  decodeFunctionResult(functionFragment: 'setPreSignature', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'invalidateOrder', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'domainSeparator', data: BytesLike): Result
+
+  events: {
+    'Trade(address,address,address,uint256,uint256,uint256,bytes)': EventFragment
+  }
+
+  getEvent(nameOrSignatureOrTopic: 'Trade'): EventFragment
+}
+
+export interface TradeEventObject {
+  owner: string
+  sellToken: string
+  buyToken: string
+  sellAmount: BigNumber
+  buyAmount: BigNumber
+  feeAmount: BigNumber
+  orderUid: string
+}
+export type TradeEvent = TypedEvent<[string, string, string, BigNumber, BigNumber, BigNumber, string], TradeEventObject>
+
+export type TradeEventFilter = TypedEventFilter<TradeEvent>
+
+export interface GPv2Settlement extends BaseContract {
+  connect(signerOrProvider: Signer | Provider | string): this
+  attach(addressOrName: string): this
+  deployed(): Promise<this>
+
+  interface: GPv2SettlementInterface
+
+  queryFilter<TEvent extends TypedEvent>(
+    event: TypedEventFilter<TEvent>,
+    fromBlockOrBlockhash?: string | number | undefined,
+    toBlock?: string | number | undefined
+  ): Promise<Array<TEvent>>
+
+  listeners<TEvent extends TypedEvent>(eventFilter?: TypedEventFilter<TEvent>): Array<TypedListener<TEvent>>
+  listeners(eventName?: string): Array<Listener>
+  removeAllListeners<TEvent extends TypedEvent>(eventFilter: TypedEventFilter<TEvent>): this
+  removeAllListeners(eventName?: string): this
+  off: OnEvent<this>
+  on: OnEvent<this>
+  once: OnEvent<this>
+  removeListener: OnEvent<this>
+
+  functions: {
+    setPreSignature(
+      orderUid: PromiseOrValue<BytesLike>,
+      signed: PromiseOrValue<boolean>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<ContractTransaction>
+
+    invalidateOrder(
+      orderUid: PromiseOrValue<BytesLike>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<ContractTransaction>
+
+    domainSeparator(overrides?: Overrides & { from?: PromiseOrValue<string> }): Promise<ContractTransaction>
+  }
+
+  setPreSignature(
+    orderUid: PromiseOrValue<BytesLike>,
+    signed: PromiseOrValue<boolean>,
+    overrides?: Overrides & { from?: PromiseOrValue<string> }
+  ): Promise<ContractTransaction>
+
+  invalidateOrder(
+    orderUid: PromiseOrValue<BytesLike>,
+    overrides?: Overrides & { from?: PromiseOrValue<string> }
+  ): Promise<ContractTransaction>
+
+  domainSeparator(overrides?: Overrides & { from?: PromiseOrValue<string> }): Promise<ContractTransaction>
+
+  callStatic: {
+    setPreSignature(
+      orderUid: PromiseOrValue<BytesLike>,
+      signed: PromiseOrValue<boolean>,
+      overrides?: CallOverrides
+    ): Promise<void>
+
+    invalidateOrder(orderUid: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<void>
+
+    domainSeparator(overrides?: CallOverrides): Promise<string>
+  }
+
+  filters: {
+    'Trade(address,address,address,uint256,uint256,uint256,bytes)'(
+      owner?: PromiseOrValue<string> | null,
+      sellToken?: null,
+      buyToken?: null,
+      sellAmount?: null,
+      buyAmount?: null,
+      feeAmount?: null,
+      orderUid?: null
+    ): TradeEventFilter
+    Trade(
+      owner?: PromiseOrValue<string> | null,
+      sellToken?: null,
+      buyToken?: null,
+      sellAmount?: null,
+      buyAmount?: null,
+      feeAmount?: null,
+      orderUid?: null
+    ): TradeEventFilter
+  }
+
+  estimateGas: {
+    setPreSignature(
+      orderUid: PromiseOrValue<BytesLike>,
+      signed: PromiseOrValue<boolean>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<BigNumber>
+
+    invalidateOrder(
+      orderUid: PromiseOrValue<BytesLike>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<BigNumber>
+
+    domainSeparator(overrides?: Overrides & { from?: PromiseOrValue<string> }): Promise<BigNumber>
+  }
+
+  populateTransaction: {
+    setPreSignature(
+      orderUid: PromiseOrValue<BytesLike>,
+      signed: PromiseOrValue<boolean>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<PopulatedTransaction>
+
+    invalidateOrder(
+      orderUid: PromiseOrValue<BytesLike>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<PopulatedTransaction>
+
+    domainSeparator(overrides?: Overrides & { from?: PromiseOrValue<string> }): Promise<PopulatedTransaction>
+  }
+}
diff --git a/src/libs/abis/src/generated/custom/MerkleDrop.ts b/src/libs/abis/src/generated/custom/MerkleDrop.ts
new file mode 100644
index 0000000000..1f74f11038
--- /dev/null
+++ b/src/libs/abis/src/generated/custom/MerkleDrop.ts
@@ -0,0 +1,103 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+import type {
+  BaseContract,
+  BigNumber,
+  BigNumberish,
+  BytesLike,
+  CallOverrides,
+  ContractTransaction,
+  Overrides,
+  PopulatedTransaction,
+  Signer,
+  utils,
+} from 'ethers'
+import type { FunctionFragment, Result } from '@ethersproject/abi'
+import type { Listener, Provider } from '@ethersproject/providers'
+import type { TypedEventFilter, TypedEvent, TypedListener, OnEvent, PromiseOrValue } from './common'
+
+export interface MerkleDropInterface extends utils.Interface {
+  functions: {
+    'claim(uint256,uint256,bytes32[])': FunctionFragment
+  }
+
+  getFunction(nameOrSignatureOrTopic: 'claim'): FunctionFragment
+
+  encodeFunctionData(
+    functionFragment: 'claim',
+    values: [PromiseOrValue<BigNumberish>, PromiseOrValue<BigNumberish>, PromiseOrValue<BytesLike>[]]
+  ): string
+
+  decodeFunctionResult(functionFragment: 'claim', data: BytesLike): Result
+
+  events: {}
+}
+
+export interface MerkleDrop extends BaseContract {
+  connect(signerOrProvider: Signer | Provider | string): this
+  attach(addressOrName: string): this
+  deployed(): Promise<this>
+
+  interface: MerkleDropInterface
+
+  queryFilter<TEvent extends TypedEvent>(
+    event: TypedEventFilter<TEvent>,
+    fromBlockOrBlockhash?: string | number | undefined,
+    toBlock?: string | number | undefined
+  ): Promise<Array<TEvent>>
+
+  listeners<TEvent extends TypedEvent>(eventFilter?: TypedEventFilter<TEvent>): Array<TypedListener<TEvent>>
+  listeners(eventName?: string): Array<Listener>
+  removeAllListeners<TEvent extends TypedEvent>(eventFilter: TypedEventFilter<TEvent>): this
+  removeAllListeners(eventName?: string): this
+  off: OnEvent<this>
+  on: OnEvent<this>
+  once: OnEvent<this>
+  removeListener: OnEvent<this>
+
+  functions: {
+    claim(
+      index: PromiseOrValue<BigNumberish>,
+      amount: PromiseOrValue<BigNumberish>,
+      merkleProof: PromiseOrValue<BytesLike>[],
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<ContractTransaction>
+  }
+
+  claim(
+    index: PromiseOrValue<BigNumberish>,
+    amount: PromiseOrValue<BigNumberish>,
+    merkleProof: PromiseOrValue<BytesLike>[],
+    overrides?: Overrides & { from?: PromiseOrValue<string> }
+  ): Promise<ContractTransaction>
+
+  callStatic: {
+    claim(
+      index: PromiseOrValue<BigNumberish>,
+      amount: PromiseOrValue<BigNumberish>,
+      merkleProof: PromiseOrValue<BytesLike>[],
+      overrides?: CallOverrides
+    ): Promise<void>
+  }
+
+  filters: {}
+
+  estimateGas: {
+    claim(
+      index: PromiseOrValue<BigNumberish>,
+      amount: PromiseOrValue<BigNumberish>,
+      merkleProof: PromiseOrValue<BytesLike>[],
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<BigNumber>
+  }
+
+  populateTransaction: {
+    claim(
+      index: PromiseOrValue<BigNumberish>,
+      amount: PromiseOrValue<BigNumberish>,
+      merkleProof: PromiseOrValue<BytesLike>[],
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<PopulatedTransaction>
+  }
+}
diff --git a/src/libs/abis/src/generated/custom/SignatureVerifierMuxer.ts b/src/libs/abis/src/generated/custom/SignatureVerifierMuxer.ts
new file mode 100644
index 0000000000..94bc229a5f
--- /dev/null
+++ b/src/libs/abis/src/generated/custom/SignatureVerifierMuxer.ts
@@ -0,0 +1,158 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+import type {
+  BaseContract,
+  BigNumber,
+  BytesLike,
+  CallOverrides,
+  ContractTransaction,
+  Overrides,
+  PopulatedTransaction,
+  Signer,
+  utils,
+} from 'ethers'
+import type { FunctionFragment, Result } from '@ethersproject/abi'
+import type { Listener, Provider } from '@ethersproject/providers'
+import type { TypedEventFilter, TypedEvent, TypedListener, OnEvent, PromiseOrValue } from './common'
+
+export interface SignatureVerifierMuxerInterface extends utils.Interface {
+  functions: {
+    'setDomainVerifier(bytes32,address)': FunctionFragment
+    'setFallbackHandler(address)': FunctionFragment
+    'domainVerifiers(address,bytes32)': FunctionFragment
+  }
+
+  getFunction(nameOrSignatureOrTopic: 'setDomainVerifier' | 'setFallbackHandler' | 'domainVerifiers'): FunctionFragment
+
+  encodeFunctionData(
+    functionFragment: 'setDomainVerifier',
+    values: [PromiseOrValue<BytesLike>, PromiseOrValue<string>]
+  ): string
+  encodeFunctionData(functionFragment: 'setFallbackHandler', values: [PromiseOrValue<string>]): string
+  encodeFunctionData(
+    functionFragment: 'domainVerifiers',
+    values: [PromiseOrValue<string>, PromiseOrValue<BytesLike>]
+  ): string
+
+  decodeFunctionResult(functionFragment: 'setDomainVerifier', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'setFallbackHandler', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'domainVerifiers', data: BytesLike): Result
+
+  events: {}
+}
+
+export interface SignatureVerifierMuxer extends BaseContract {
+  connect(signerOrProvider: Signer | Provider | string): this
+  attach(addressOrName: string): this
+  deployed(): Promise<this>
+
+  interface: SignatureVerifierMuxerInterface
+
+  queryFilter<TEvent extends TypedEvent>(
+    event: TypedEventFilter<TEvent>,
+    fromBlockOrBlockhash?: string | number | undefined,
+    toBlock?: string | number | undefined
+  ): Promise<Array<TEvent>>
+
+  listeners<TEvent extends TypedEvent>(eventFilter?: TypedEventFilter<TEvent>): Array<TypedListener<TEvent>>
+  listeners(eventName?: string): Array<Listener>
+  removeAllListeners<TEvent extends TypedEvent>(eventFilter: TypedEventFilter<TEvent>): this
+  removeAllListeners(eventName?: string): this
+  off: OnEvent<this>
+  on: OnEvent<this>
+  once: OnEvent<this>
+  removeListener: OnEvent<this>
+
+  functions: {
+    setDomainVerifier(
+      domainSeparator: PromiseOrValue<BytesLike>,
+      newVerifier: PromiseOrValue<string>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<ContractTransaction>
+
+    setFallbackHandler(
+      handler: PromiseOrValue<string>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<ContractTransaction>
+
+    domainVerifiers(
+      safe: PromiseOrValue<string>,
+      domainSeparator: PromiseOrValue<BytesLike>,
+      overrides?: CallOverrides
+    ): Promise<[string]>
+  }
+
+  setDomainVerifier(
+    domainSeparator: PromiseOrValue<BytesLike>,
+    newVerifier: PromiseOrValue<string>,
+    overrides?: Overrides & { from?: PromiseOrValue<string> }
+  ): Promise<ContractTransaction>
+
+  setFallbackHandler(
+    handler: PromiseOrValue<string>,
+    overrides?: Overrides & { from?: PromiseOrValue<string> }
+  ): Promise<ContractTransaction>
+
+  domainVerifiers(
+    safe: PromiseOrValue<string>,
+    domainSeparator: PromiseOrValue<BytesLike>,
+    overrides?: CallOverrides
+  ): Promise<string>
+
+  callStatic: {
+    setDomainVerifier(
+      domainSeparator: PromiseOrValue<BytesLike>,
+      newVerifier: PromiseOrValue<string>,
+      overrides?: CallOverrides
+    ): Promise<void>
+
+    setFallbackHandler(handler: PromiseOrValue<string>, overrides?: CallOverrides): Promise<void>
+
+    domainVerifiers(
+      safe: PromiseOrValue<string>,
+      domainSeparator: PromiseOrValue<BytesLike>,
+      overrides?: CallOverrides
+    ): Promise<string>
+  }
+
+  filters: {}
+
+  estimateGas: {
+    setDomainVerifier(
+      domainSeparator: PromiseOrValue<BytesLike>,
+      newVerifier: PromiseOrValue<string>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<BigNumber>
+
+    setFallbackHandler(
+      handler: PromiseOrValue<string>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<BigNumber>
+
+    domainVerifiers(
+      safe: PromiseOrValue<string>,
+      domainSeparator: PromiseOrValue<BytesLike>,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>
+  }
+
+  populateTransaction: {
+    setDomainVerifier(
+      domainSeparator: PromiseOrValue<BytesLike>,
+      newVerifier: PromiseOrValue<string>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<PopulatedTransaction>
+
+    setFallbackHandler(
+      handler: PromiseOrValue<string>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<PopulatedTransaction>
+
+    domainVerifiers(
+      safe: PromiseOrValue<string>,
+      domainSeparator: PromiseOrValue<BytesLike>,
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>
+  }
+}
diff --git a/src/libs/abis/src/generated/custom/TokenDistro.ts b/src/libs/abis/src/generated/custom/TokenDistro.ts
new file mode 100644
index 0000000000..c195f22e4e
--- /dev/null
+++ b/src/libs/abis/src/generated/custom/TokenDistro.ts
@@ -0,0 +1,106 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+import type {
+  BaseContract,
+  BigNumber,
+  BytesLike,
+  CallOverrides,
+  ContractTransaction,
+  Overrides,
+  PopulatedTransaction,
+  Signer,
+  utils,
+} from 'ethers'
+import type { FunctionFragment, Result } from '@ethersproject/abi'
+import type { Listener, Provider } from '@ethersproject/providers'
+import type { TypedEventFilter, TypedEvent, TypedListener, OnEvent, PromiseOrValue } from './common'
+
+export interface TokenDistroInterface extends utils.Interface {
+  functions: {
+    'balances(address)': FunctionFragment
+    'claim()': FunctionFragment
+  }
+
+  getFunction(nameOrSignatureOrTopic: 'balances' | 'claim'): FunctionFragment
+
+  encodeFunctionData(functionFragment: 'balances', values: [PromiseOrValue<string>]): string
+  encodeFunctionData(functionFragment: 'claim', values?: undefined): string
+
+  decodeFunctionResult(functionFragment: 'balances', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'claim', data: BytesLike): Result
+
+  events: {}
+}
+
+export interface TokenDistro extends BaseContract {
+  connect(signerOrProvider: Signer | Provider | string): this
+  attach(addressOrName: string): this
+  deployed(): Promise<this>
+
+  interface: TokenDistroInterface
+
+  queryFilter<TEvent extends TypedEvent>(
+    event: TypedEventFilter<TEvent>,
+    fromBlockOrBlockhash?: string | number | undefined,
+    toBlock?: string | number | undefined
+  ): Promise<Array<TEvent>>
+
+  listeners<TEvent extends TypedEvent>(eventFilter?: TypedEventFilter<TEvent>): Array<TypedListener<TEvent>>
+  listeners(eventName?: string): Array<Listener>
+  removeAllListeners<TEvent extends TypedEvent>(eventFilter: TypedEventFilter<TEvent>): this
+  removeAllListeners(eventName?: string): this
+  off: OnEvent<this>
+  on: OnEvent<this>
+  once: OnEvent<this>
+  removeListener: OnEvent<this>
+
+  functions: {
+    balances(
+      arg0: PromiseOrValue<string>,
+      overrides?: CallOverrides
+    ): Promise<
+      [BigNumber, BigNumber] & {
+        allocatedTokens: BigNumber
+        claimed: BigNumber
+      }
+    >
+
+    claim(overrides?: Overrides & { from?: PromiseOrValue<string> }): Promise<ContractTransaction>
+  }
+
+  balances(
+    arg0: PromiseOrValue<string>,
+    overrides?: CallOverrides
+  ): Promise<[BigNumber, BigNumber] & { allocatedTokens: BigNumber; claimed: BigNumber }>
+
+  claim(overrides?: Overrides & { from?: PromiseOrValue<string> }): Promise<ContractTransaction>
+
+  callStatic: {
+    balances(
+      arg0: PromiseOrValue<string>,
+      overrides?: CallOverrides
+    ): Promise<
+      [BigNumber, BigNumber] & {
+        allocatedTokens: BigNumber
+        claimed: BigNumber
+      }
+    >
+
+    claim(overrides?: CallOverrides): Promise<void>
+  }
+
+  filters: {}
+
+  estimateGas: {
+    balances(arg0: PromiseOrValue<string>, overrides?: CallOverrides): Promise<BigNumber>
+
+    claim(overrides?: Overrides & { from?: PromiseOrValue<string> }): Promise<BigNumber>
+  }
+
+  populateTransaction: {
+    balances(arg0: PromiseOrValue<string>, overrides?: CallOverrides): Promise<PopulatedTransaction>
+
+    claim(overrides?: Overrides & { from?: PromiseOrValue<string> }): Promise<PopulatedTransaction>
+  }
+}
diff --git a/src/libs/abis/src/generated/custom/VCow.ts b/src/libs/abis/src/generated/custom/VCow.ts
new file mode 100644
index 0000000000..5a50007bbe
--- /dev/null
+++ b/src/libs/abis/src/generated/custom/VCow.ts
@@ -0,0 +1,355 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+import type {
+  BaseContract,
+  BigNumber,
+  BigNumberish,
+  BytesLike,
+  CallOverrides,
+  ContractTransaction,
+  Overrides,
+  PayableOverrides,
+  PopulatedTransaction,
+  Signer,
+  utils,
+} from 'ethers'
+import type { FunctionFragment, Result, EventFragment } from '@ethersproject/abi'
+import type { Listener, Provider } from '@ethersproject/providers'
+import type { TypedEventFilter, TypedEvent, TypedListener, OnEvent, PromiseOrValue } from './common'
+
+export interface VCowInterface extends utils.Interface {
+  functions: {
+    'claim(uint256,uint8,address,uint256,uint256,bytes32[])': FunctionFragment
+    'claimMany(uint256[],uint8[],address[],uint256[],uint256[],bytes32[][],uint256[])': FunctionFragment
+    'isClaimed(uint256)': FunctionFragment
+    'merkleRoot()': FunctionFragment
+    'deploymentTimestamp()': FunctionFragment
+    'gnoPrice()': FunctionFragment
+    'usdcPrice()': FunctionFragment
+    'nativeTokenPrice()': FunctionFragment
+    'swappableBalanceOf(address)': FunctionFragment
+    'balanceOf(address)': FunctionFragment
+    'swapAll()': FunctionFragment
+  }
+
+  getFunction(
+    nameOrSignatureOrTopic:
+      | 'claim'
+      | 'claimMany'
+      | 'isClaimed'
+      | 'merkleRoot'
+      | 'deploymentTimestamp'
+      | 'gnoPrice'
+      | 'usdcPrice'
+      | 'nativeTokenPrice'
+      | 'swappableBalanceOf'
+      | 'balanceOf'
+      | 'swapAll'
+  ): FunctionFragment
+
+  encodeFunctionData(
+    functionFragment: 'claim',
+    values: [
+      PromiseOrValue<BigNumberish>,
+      PromiseOrValue<BigNumberish>,
+      PromiseOrValue<string>,
+      PromiseOrValue<BigNumberish>,
+      PromiseOrValue<BigNumberish>,
+      PromiseOrValue<BytesLike>[]
+    ]
+  ): string
+  encodeFunctionData(
+    functionFragment: 'claimMany',
+    values: [
+      PromiseOrValue<BigNumberish>[],
+      PromiseOrValue<BigNumberish>[],
+      PromiseOrValue<string>[],
+      PromiseOrValue<BigNumberish>[],
+      PromiseOrValue<BigNumberish>[],
+      PromiseOrValue<BytesLike>[][],
+      PromiseOrValue<BigNumberish>[]
+    ]
+  ): string
+  encodeFunctionData(functionFragment: 'isClaimed', values: [PromiseOrValue<BigNumberish>]): string
+  encodeFunctionData(functionFragment: 'merkleRoot', values?: undefined): string
+  encodeFunctionData(functionFragment: 'deploymentTimestamp', values?: undefined): string
+  encodeFunctionData(functionFragment: 'gnoPrice', values?: undefined): string
+  encodeFunctionData(functionFragment: 'usdcPrice', values?: undefined): string
+  encodeFunctionData(functionFragment: 'nativeTokenPrice', values?: undefined): string
+  encodeFunctionData(functionFragment: 'swappableBalanceOf', values: [PromiseOrValue<string>]): string
+  encodeFunctionData(functionFragment: 'balanceOf', values: [PromiseOrValue<string>]): string
+  encodeFunctionData(functionFragment: 'swapAll', values?: undefined): string
+
+  decodeFunctionResult(functionFragment: 'claim', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'claimMany', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'isClaimed', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'merkleRoot', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'deploymentTimestamp', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'gnoPrice', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'usdcPrice', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'nativeTokenPrice', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'swappableBalanceOf', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'balanceOf', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'swapAll', data: BytesLike): Result
+
+  events: {
+    'Claimed(uint256,uint8,address,uint256,uint256)': EventFragment
+  }
+
+  getEvent(nameOrSignatureOrTopic: 'Claimed'): EventFragment
+}
+
+export interface ClaimedEventObject {
+  index: BigNumber
+  claimType: number
+  claimant: string
+  claimableAmount: BigNumber
+  claimedAmount: BigNumber
+}
+export type ClaimedEvent = TypedEvent<[BigNumber, number, string, BigNumber, BigNumber], ClaimedEventObject>
+
+export type ClaimedEventFilter = TypedEventFilter<ClaimedEvent>
+
+export interface VCow extends BaseContract {
+  connect(signerOrProvider: Signer | Provider | string): this
+  attach(addressOrName: string): this
+  deployed(): Promise<this>
+
+  interface: VCowInterface
+
+  queryFilter<TEvent extends TypedEvent>(
+    event: TypedEventFilter<TEvent>,
+    fromBlockOrBlockhash?: string | number | undefined,
+    toBlock?: string | number | undefined
+  ): Promise<Array<TEvent>>
+
+  listeners<TEvent extends TypedEvent>(eventFilter?: TypedEventFilter<TEvent>): Array<TypedListener<TEvent>>
+  listeners(eventName?: string): Array<Listener>
+  removeAllListeners<TEvent extends TypedEvent>(eventFilter: TypedEventFilter<TEvent>): this
+  removeAllListeners(eventName?: string): this
+  off: OnEvent<this>
+  on: OnEvent<this>
+  once: OnEvent<this>
+  removeListener: OnEvent<this>
+
+  functions: {
+    claim(
+      index: PromiseOrValue<BigNumberish>,
+      claimType: PromiseOrValue<BigNumberish>,
+      claimant: PromiseOrValue<string>,
+      claimableAmount: PromiseOrValue<BigNumberish>,
+      claimedAmount: PromiseOrValue<BigNumberish>,
+      merkleProof: PromiseOrValue<BytesLike>[],
+      overrides?: PayableOverrides & { from?: PromiseOrValue<string> }
+    ): Promise<ContractTransaction>
+
+    claimMany(
+      indices: PromiseOrValue<BigNumberish>[],
+      claimTypes: PromiseOrValue<BigNumberish>[],
+      claimants: PromiseOrValue<string>[],
+      claimableAmounts: PromiseOrValue<BigNumberish>[],
+      claimedAmounts: PromiseOrValue<BigNumberish>[],
+      merkleProofs: PromiseOrValue<BytesLike>[][],
+      sentEth: PromiseOrValue<BigNumberish>[],
+      overrides?: PayableOverrides & { from?: PromiseOrValue<string> }
+    ): Promise<ContractTransaction>
+
+    isClaimed(index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[boolean]>
+
+    merkleRoot(overrides?: CallOverrides): Promise<[string]>
+
+    deploymentTimestamp(overrides?: CallOverrides): Promise<[BigNumber]>
+
+    gnoPrice(overrides?: CallOverrides): Promise<[BigNumber]>
+
+    usdcPrice(overrides?: CallOverrides): Promise<[BigNumber]>
+
+    nativeTokenPrice(overrides?: CallOverrides): Promise<[BigNumber]>
+
+    swappableBalanceOf(user: PromiseOrValue<string>, overrides?: CallOverrides): Promise<[BigNumber]>
+
+    balanceOf(user: PromiseOrValue<string>, overrides?: CallOverrides): Promise<[BigNumber]>
+
+    swapAll(overrides?: Overrides & { from?: PromiseOrValue<string> }): Promise<ContractTransaction>
+  }
+
+  claim(
+    index: PromiseOrValue<BigNumberish>,
+    claimType: PromiseOrValue<BigNumberish>,
+    claimant: PromiseOrValue<string>,
+    claimableAmount: PromiseOrValue<BigNumberish>,
+    claimedAmount: PromiseOrValue<BigNumberish>,
+    merkleProof: PromiseOrValue<BytesLike>[],
+    overrides?: PayableOverrides & { from?: PromiseOrValue<string> }
+  ): Promise<ContractTransaction>
+
+  claimMany(
+    indices: PromiseOrValue<BigNumberish>[],
+    claimTypes: PromiseOrValue<BigNumberish>[],
+    claimants: PromiseOrValue<string>[],
+    claimableAmounts: PromiseOrValue<BigNumberish>[],
+    claimedAmounts: PromiseOrValue<BigNumberish>[],
+    merkleProofs: PromiseOrValue<BytesLike>[][],
+    sentEth: PromiseOrValue<BigNumberish>[],
+    overrides?: PayableOverrides & { from?: PromiseOrValue<string> }
+  ): Promise<ContractTransaction>
+
+  isClaimed(index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<boolean>
+
+  merkleRoot(overrides?: CallOverrides): Promise<string>
+
+  deploymentTimestamp(overrides?: CallOverrides): Promise<BigNumber>
+
+  gnoPrice(overrides?: CallOverrides): Promise<BigNumber>
+
+  usdcPrice(overrides?: CallOverrides): Promise<BigNumber>
+
+  nativeTokenPrice(overrides?: CallOverrides): Promise<BigNumber>
+
+  swappableBalanceOf(user: PromiseOrValue<string>, overrides?: CallOverrides): Promise<BigNumber>
+
+  balanceOf(user: PromiseOrValue<string>, overrides?: CallOverrides): Promise<BigNumber>
+
+  swapAll(overrides?: Overrides & { from?: PromiseOrValue<string> }): Promise<ContractTransaction>
+
+  callStatic: {
+    claim(
+      index: PromiseOrValue<BigNumberish>,
+      claimType: PromiseOrValue<BigNumberish>,
+      claimant: PromiseOrValue<string>,
+      claimableAmount: PromiseOrValue<BigNumberish>,
+      claimedAmount: PromiseOrValue<BigNumberish>,
+      merkleProof: PromiseOrValue<BytesLike>[],
+      overrides?: CallOverrides
+    ): Promise<void>
+
+    claimMany(
+      indices: PromiseOrValue<BigNumberish>[],
+      claimTypes: PromiseOrValue<BigNumberish>[],
+      claimants: PromiseOrValue<string>[],
+      claimableAmounts: PromiseOrValue<BigNumberish>[],
+      claimedAmounts: PromiseOrValue<BigNumberish>[],
+      merkleProofs: PromiseOrValue<BytesLike>[][],
+      sentEth: PromiseOrValue<BigNumberish>[],
+      overrides?: CallOverrides
+    ): Promise<void>
+
+    isClaimed(index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<boolean>
+
+    merkleRoot(overrides?: CallOverrides): Promise<string>
+
+    deploymentTimestamp(overrides?: CallOverrides): Promise<BigNumber>
+
+    gnoPrice(overrides?: CallOverrides): Promise<BigNumber>
+
+    usdcPrice(overrides?: CallOverrides): Promise<BigNumber>
+
+    nativeTokenPrice(overrides?: CallOverrides): Promise<BigNumber>
+
+    swappableBalanceOf(user: PromiseOrValue<string>, overrides?: CallOverrides): Promise<BigNumber>
+
+    balanceOf(user: PromiseOrValue<string>, overrides?: CallOverrides): Promise<BigNumber>
+
+    swapAll(overrides?: CallOverrides): Promise<BigNumber>
+  }
+
+  filters: {
+    'Claimed(uint256,uint8,address,uint256,uint256)'(
+      index?: null,
+      claimType?: null,
+      claimant?: null,
+      claimableAmount?: null,
+      claimedAmount?: null
+    ): ClaimedEventFilter
+    Claimed(
+      index?: null,
+      claimType?: null,
+      claimant?: null,
+      claimableAmount?: null,
+      claimedAmount?: null
+    ): ClaimedEventFilter
+  }
+
+  estimateGas: {
+    claim(
+      index: PromiseOrValue<BigNumberish>,
+      claimType: PromiseOrValue<BigNumberish>,
+      claimant: PromiseOrValue<string>,
+      claimableAmount: PromiseOrValue<BigNumberish>,
+      claimedAmount: PromiseOrValue<BigNumberish>,
+      merkleProof: PromiseOrValue<BytesLike>[],
+      overrides?: PayableOverrides & { from?: PromiseOrValue<string> }
+    ): Promise<BigNumber>
+
+    claimMany(
+      indices: PromiseOrValue<BigNumberish>[],
+      claimTypes: PromiseOrValue<BigNumberish>[],
+      claimants: PromiseOrValue<string>[],
+      claimableAmounts: PromiseOrValue<BigNumberish>[],
+      claimedAmounts: PromiseOrValue<BigNumberish>[],
+      merkleProofs: PromiseOrValue<BytesLike>[][],
+      sentEth: PromiseOrValue<BigNumberish>[],
+      overrides?: PayableOverrides & { from?: PromiseOrValue<string> }
+    ): Promise<BigNumber>
+
+    isClaimed(index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>
+
+    merkleRoot(overrides?: CallOverrides): Promise<BigNumber>
+
+    deploymentTimestamp(overrides?: CallOverrides): Promise<BigNumber>
+
+    gnoPrice(overrides?: CallOverrides): Promise<BigNumber>
+
+    usdcPrice(overrides?: CallOverrides): Promise<BigNumber>
+
+    nativeTokenPrice(overrides?: CallOverrides): Promise<BigNumber>
+
+    swappableBalanceOf(user: PromiseOrValue<string>, overrides?: CallOverrides): Promise<BigNumber>
+
+    balanceOf(user: PromiseOrValue<string>, overrides?: CallOverrides): Promise<BigNumber>
+
+    swapAll(overrides?: Overrides & { from?: PromiseOrValue<string> }): Promise<BigNumber>
+  }
+
+  populateTransaction: {
+    claim(
+      index: PromiseOrValue<BigNumberish>,
+      claimType: PromiseOrValue<BigNumberish>,
+      claimant: PromiseOrValue<string>,
+      claimableAmount: PromiseOrValue<BigNumberish>,
+      claimedAmount: PromiseOrValue<BigNumberish>,
+      merkleProof: PromiseOrValue<BytesLike>[],
+      overrides?: PayableOverrides & { from?: PromiseOrValue<string> }
+    ): Promise<PopulatedTransaction>
+
+    claimMany(
+      indices: PromiseOrValue<BigNumberish>[],
+      claimTypes: PromiseOrValue<BigNumberish>[],
+      claimants: PromiseOrValue<string>[],
+      claimableAmounts: PromiseOrValue<BigNumberish>[],
+      claimedAmounts: PromiseOrValue<BigNumberish>[],
+      merkleProofs: PromiseOrValue<BytesLike>[][],
+      sentEth: PromiseOrValue<BigNumberish>[],
+      overrides?: PayableOverrides & { from?: PromiseOrValue<string> }
+    ): Promise<PopulatedTransaction>
+
+    isClaimed(index: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>
+
+    merkleRoot(overrides?: CallOverrides): Promise<PopulatedTransaction>
+
+    deploymentTimestamp(overrides?: CallOverrides): Promise<PopulatedTransaction>
+
+    gnoPrice(overrides?: CallOverrides): Promise<PopulatedTransaction>
+
+    usdcPrice(overrides?: CallOverrides): Promise<PopulatedTransaction>
+
+    nativeTokenPrice(overrides?: CallOverrides): Promise<PopulatedTransaction>
+
+    swappableBalanceOf(user: PromiseOrValue<string>, overrides?: CallOverrides): Promise<PopulatedTransaction>
+
+    balanceOf(user: PromiseOrValue<string>, overrides?: CallOverrides): Promise<PopulatedTransaction>
+
+    swapAll(overrides?: Overrides & { from?: PromiseOrValue<string> }): Promise<PopulatedTransaction>
+  }
+}
diff --git a/src/libs/abis/src/generated/custom/common.ts b/src/libs/abis/src/generated/custom/common.ts
new file mode 100644
index 0000000000..5d37e711b7
--- /dev/null
+++ b/src/libs/abis/src/generated/custom/common.ts
@@ -0,0 +1,32 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+import type { Listener } from '@ethersproject/providers'
+import type { Event, EventFilter } from 'ethers'
+
+export interface TypedEvent<TArgsArray extends Array<any> = any, TArgsObject = any> extends Event {
+  args: TArgsArray & TArgsObject
+}
+
+export interface TypedEventFilter<_TEvent extends TypedEvent> extends EventFilter {}
+
+export interface TypedListener<TEvent extends TypedEvent> {
+  (...listenerArg: [...__TypechainArgsArray<TEvent>, TEvent]): void
+}
+
+type __TypechainArgsArray<T> = T extends TypedEvent<infer U> ? U : never
+
+export interface OnEvent<TRes> {
+  <TEvent extends TypedEvent>(eventFilter: TypedEventFilter<TEvent>, listener: TypedListener<TEvent>): TRes
+  (eventName: string, listener: Listener): TRes
+}
+
+export type MinEthersFactory<C, ARGS> = {
+  deploy(...a: ARGS[]): Promise<C>
+}
+
+export type GetContractTypeFromFactory<F> = F extends MinEthersFactory<infer C, any> ? C : never
+
+export type GetARGsTypeFromFactory<F> = F extends MinEthersFactory<any, any> ? Parameters<F['deploy']> : never
+
+export type PromiseOrValue<T> = T | Promise<T>
diff --git a/src/libs/abis/src/generated/custom/factories/ComposableCoW__factory.ts b/src/libs/abis/src/generated/custom/factories/ComposableCoW__factory.ts
new file mode 100644
index 0000000000..19a2d270ec
--- /dev/null
+++ b/src/libs/abis/src/generated/custom/factories/ComposableCoW__factory.ts
@@ -0,0 +1,217 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+
+import { Contract, Signer, utils } from 'ethers'
+import type { Provider } from '@ethersproject/providers'
+import type { ComposableCoW, ComposableCoWInterface } from '../ComposableCoW'
+
+const _abi = [
+  {
+    inputs: [
+      {
+        components: [
+          {
+            internalType: 'contract IConditionalOrder',
+            name: 'handler',
+            type: 'address',
+          },
+          {
+            internalType: 'bytes32',
+            name: 'salt',
+            type: 'bytes32',
+          },
+          {
+            internalType: 'bytes',
+            name: 'staticInput',
+            type: 'bytes',
+          },
+        ],
+        internalType: 'struct IConditionalOrder.ConditionalOrderParams',
+        name: 'params',
+        type: 'tuple',
+      },
+      {
+        internalType: 'contract IValueFactory',
+        name: 'factory',
+        type: 'address',
+      },
+      {
+        internalType: 'bytes',
+        name: 'data',
+        type: 'bytes',
+      },
+      {
+        internalType: 'bool',
+        name: 'dispatch',
+        type: 'bool',
+      },
+    ],
+    name: 'createWithContext',
+    outputs: [],
+    stateMutability: 'nonpayable',
+    type: 'function',
+  },
+  {
+    inputs: [
+      {
+        name: 'safe',
+        type: 'address',
+      },
+      {
+        name: 'singleOrderHash',
+        type: 'bytes32',
+      },
+    ],
+    name: 'singleOrders',
+    outputs: [
+      {
+        name: '',
+        type: 'bool',
+      },
+    ],
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    inputs: [
+      {
+        internalType: 'address',
+        name: 'owner',
+        type: 'address',
+      },
+      {
+        components: [
+          {
+            internalType: 'contract IConditionalOrder',
+            name: 'handler',
+            type: 'address',
+          },
+          {
+            internalType: 'bytes32',
+            name: 'salt',
+            type: 'bytes32',
+          },
+          {
+            internalType: 'bytes',
+            name: 'staticInput',
+            type: 'bytes',
+          },
+        ],
+        internalType: 'struct IConditionalOrder.ConditionalOrderParams',
+        name: 'params',
+        type: 'tuple',
+      },
+      {
+        internalType: 'bytes',
+        name: 'offchainInput',
+        type: 'bytes',
+      },
+      {
+        internalType: 'bytes32[]',
+        name: 'proof',
+        type: 'bytes32[]',
+      },
+    ],
+    name: 'getTradeableOrderWithSignature',
+    outputs: [
+      {
+        components: [
+          {
+            internalType: 'contract IERC20',
+            name: 'sellToken',
+            type: 'address',
+          },
+          {
+            internalType: 'contract IERC20',
+            name: 'buyToken',
+            type: 'address',
+          },
+          {
+            internalType: 'address',
+            name: 'receiver',
+            type: 'address',
+          },
+          {
+            internalType: 'uint256',
+            name: 'sellAmount',
+            type: 'uint256',
+          },
+          {
+            internalType: 'uint256',
+            name: 'buyAmount',
+            type: 'uint256',
+          },
+          {
+            internalType: 'uint32',
+            name: 'validTo',
+            type: 'uint32',
+          },
+          {
+            internalType: 'bytes32',
+            name: 'appData',
+            type: 'bytes32',
+          },
+          {
+            internalType: 'uint256',
+            name: 'feeAmount',
+            type: 'uint256',
+          },
+          {
+            internalType: 'bytes32',
+            name: 'kind',
+            type: 'bytes32',
+          },
+          {
+            internalType: 'bool',
+            name: 'partiallyFillable',
+            type: 'bool',
+          },
+          {
+            internalType: 'bytes32',
+            name: 'sellTokenBalance',
+            type: 'bytes32',
+          },
+          {
+            internalType: 'bytes32',
+            name: 'buyTokenBalance',
+            type: 'bytes32',
+          },
+        ],
+        internalType: 'struct GPv2Order.Data',
+        name: 'order',
+        type: 'tuple',
+      },
+      {
+        internalType: 'bytes',
+        name: 'signature',
+        type: 'bytes',
+      },
+    ],
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    inputs: [
+      {
+        internalType: 'bytes32',
+        name: 'singleOrderHash',
+        type: 'bytes32',
+      },
+    ],
+    name: 'remove',
+    outputs: [],
+    stateMutability: 'nonpayable',
+    type: 'function',
+  },
+] as const
+
+export class ComposableCoW__factory {
+  static readonly abi = _abi
+  static createInterface(): ComposableCoWInterface {
+    return new utils.Interface(_abi) as ComposableCoWInterface
+  }
+  static connect(address: string, signerOrProvider: Signer | Provider): ComposableCoW {
+    return new Contract(address, _abi, signerOrProvider) as ComposableCoW
+  }
+}
diff --git a/src/libs/abis/src/generated/custom/factories/ExtensibleFallbackHandler__factory.ts b/src/libs/abis/src/generated/custom/factories/ExtensibleFallbackHandler__factory.ts
new file mode 100644
index 0000000000..50f7c633ea
--- /dev/null
+++ b/src/libs/abis/src/generated/custom/factories/ExtensibleFallbackHandler__factory.ts
@@ -0,0 +1,166 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+
+import { Contract, Signer, utils } from 'ethers'
+import type { Provider } from '@ethersproject/providers'
+import type { ExtensibleFallbackHandler, ExtensibleFallbackHandlerInterface } from '../ExtensibleFallbackHandler'
+
+const _abi = [
+  {
+    inputs: [
+      {
+        internalType: 'address',
+        name: '_defaultFallbackHandler',
+        type: 'address',
+      },
+    ],
+    stateMutability: 'nonpayable',
+    type: 'constructor',
+  },
+  {
+    anonymous: false,
+    inputs: [
+      {
+        indexed: true,
+        internalType: 'contract Safe',
+        name: 'safe',
+        type: 'address',
+      },
+      {
+        indexed: false,
+        internalType: 'bytes4',
+        name: 'selector',
+        type: 'bytes4',
+      },
+      {
+        indexed: false,
+        internalType: 'contract IFallbackMethod',
+        name: 'handler',
+        type: 'address',
+      },
+    ],
+    name: 'AddedSafeMethod',
+    type: 'event',
+  },
+  {
+    anonymous: false,
+    inputs: [
+      {
+        indexed: true,
+        internalType: 'contract Safe',
+        name: 'safe',
+        type: 'address',
+      },
+      {
+        indexed: false,
+        internalType: 'address',
+        name: 'oldHandler',
+        type: 'address',
+      },
+      {
+        indexed: false,
+        internalType: 'address',
+        name: 'newHandler',
+        type: 'address',
+      },
+    ],
+    name: 'ChangedDefaultFallbackHandler',
+    type: 'event',
+  },
+  {
+    anonymous: false,
+    inputs: [
+      {
+        indexed: true,
+        internalType: 'contract Safe',
+        name: 'safe',
+        type: 'address',
+      },
+      {
+        indexed: false,
+        internalType: 'bytes4',
+        name: 'selector',
+        type: 'bytes4',
+      },
+      {
+        indexed: false,
+        internalType: 'contract IFallbackMethod',
+        name: 'oldHandler',
+        type: 'address',
+      },
+      {
+        indexed: false,
+        internalType: 'contract IFallbackMethod',
+        name: 'newHandler',
+        type: 'address',
+      },
+    ],
+    name: 'ChangedSafeMethod',
+    type: 'event',
+  },
+  {
+    anonymous: false,
+    inputs: [
+      {
+        indexed: true,
+        internalType: 'contract Safe',
+        name: 'safe',
+        type: 'address',
+      },
+      {
+        indexed: false,
+        internalType: 'bytes4',
+        name: 'selector',
+        type: 'bytes4',
+      },
+    ],
+    name: 'RemovedSafeMethod',
+    type: 'event',
+  },
+  {
+    stateMutability: 'nonpayable',
+    type: 'fallback',
+  },
+  {
+    inputs: [
+      {
+        internalType: 'address',
+        name: 'newHandler',
+        type: 'address',
+      },
+    ],
+    name: 'setDefaultFallbackHandler',
+    outputs: [],
+    stateMutability: 'nonpayable',
+    type: 'function',
+  },
+  {
+    inputs: [
+      {
+        internalType: 'bytes4',
+        name: 'selector',
+        type: 'bytes4',
+      },
+      {
+        internalType: 'contract IFallbackMethod',
+        name: 'newHandler',
+        type: 'address',
+      },
+    ],
+    name: 'setSafeMethod',
+    outputs: [],
+    stateMutability: 'nonpayable',
+    type: 'function',
+  },
+] as const
+
+export class ExtensibleFallbackHandler__factory {
+  static readonly abi = _abi
+  static createInterface(): ExtensibleFallbackHandlerInterface {
+    return new utils.Interface(_abi) as ExtensibleFallbackHandlerInterface
+  }
+  static connect(address: string, signerOrProvider: Signer | Provider): ExtensibleFallbackHandler {
+    return new Contract(address, _abi, signerOrProvider) as ExtensibleFallbackHandler
+  }
+}
diff --git a/src/libs/abis/src/generated/custom/factories/GPv2Settlement__factory.ts b/src/libs/abis/src/generated/custom/factories/GPv2Settlement__factory.ts
new file mode 100644
index 0000000000..5bf5bcef0c
--- /dev/null
+++ b/src/libs/abis/src/generated/custom/factories/GPv2Settlement__factory.ts
@@ -0,0 +1,112 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+
+import { Contract, Signer, utils } from 'ethers'
+import type { Provider } from '@ethersproject/providers'
+import type { GPv2Settlement, GPv2SettlementInterface } from '../GPv2Settlement'
+
+const _abi = [
+  {
+    anonymous: false,
+    inputs: [
+      {
+        indexed: true,
+        internalType: 'address',
+        name: 'owner',
+        type: 'address',
+      },
+      {
+        indexed: false,
+        internalType: 'contract IERC20',
+        name: 'sellToken',
+        type: 'address',
+      },
+      {
+        indexed: false,
+        internalType: 'contract IERC20',
+        name: 'buyToken',
+        type: 'address',
+      },
+      {
+        indexed: false,
+        internalType: 'uint256',
+        name: 'sellAmount',
+        type: 'uint256',
+      },
+      {
+        indexed: false,
+        internalType: 'uint256',
+        name: 'buyAmount',
+        type: 'uint256',
+      },
+      {
+        indexed: false,
+        internalType: 'uint256',
+        name: 'feeAmount',
+        type: 'uint256',
+      },
+      {
+        indexed: false,
+        internalType: 'bytes',
+        name: 'orderUid',
+        type: 'bytes',
+      },
+    ],
+    name: 'Trade',
+    type: 'event',
+  },
+  {
+    inputs: [
+      {
+        internalType: 'bytes',
+        name: 'orderUid',
+        type: 'bytes',
+      },
+      {
+        internalType: 'bool',
+        name: 'signed',
+        type: 'bool',
+      },
+    ],
+    name: 'setPreSignature',
+    outputs: [],
+    stateMutability: 'nonpayable',
+    type: 'function',
+  },
+  {
+    inputs: [
+      {
+        internalType: 'bytes',
+        name: 'orderUid',
+        type: 'bytes',
+      },
+    ],
+    name: 'invalidateOrder',
+    outputs: [],
+    stateMutability: 'nonpayable',
+    type: 'function',
+  },
+  {
+    inputs: [],
+    name: 'domainSeparator',
+    outputs: [
+      {
+        name: '',
+        type: 'bytes32',
+      },
+    ],
+    stateMutability: 'nonpayable',
+    type: 'function',
+  },
+] as const
+
+export class GPv2Settlement__factory {
+  static readonly abi = _abi
+  static createInterface(): GPv2SettlementInterface {
+    return new utils.Interface(_abi) as GPv2SettlementInterface
+  }
+  static connect(address: string, signerOrProvider: Signer | Provider): GPv2Settlement {
+    return new Contract(address, _abi, signerOrProvider) as GPv2Settlement
+  }
+}
diff --git a/src/libs/abis/src/generated/custom/factories/MerkleDrop__factory.ts b/src/libs/abis/src/generated/custom/factories/MerkleDrop__factory.ts
new file mode 100644
index 0000000000..41b6fb228a
--- /dev/null
+++ b/src/libs/abis/src/generated/custom/factories/MerkleDrop__factory.ts
@@ -0,0 +1,43 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+
+import { Contract, Signer, utils } from 'ethers'
+import type { Provider } from '@ethersproject/providers'
+import type { MerkleDrop, MerkleDropInterface } from '../MerkleDrop'
+
+const _abi = [
+  {
+    inputs: [
+      {
+        internalType: 'uint256',
+        name: 'index',
+        type: 'uint256',
+      },
+      {
+        internalType: 'uint256',
+        name: 'amount',
+        type: 'uint256',
+      },
+      {
+        internalType: 'bytes32[]',
+        name: 'merkleProof',
+        type: 'bytes32[]',
+      },
+    ],
+    name: 'claim',
+    outputs: [],
+    stateMutability: 'nonpayable',
+    type: 'function',
+  },
+] as const
+
+export class MerkleDrop__factory {
+  static readonly abi = _abi
+  static createInterface(): MerkleDropInterface {
+    return new utils.Interface(_abi) as MerkleDropInterface
+  }
+  static connect(address: string, signerOrProvider: Signer | Provider): MerkleDrop {
+    return new Contract(address, _abi, signerOrProvider) as MerkleDrop
+  }
+}
diff --git a/src/libs/abis/src/generated/custom/factories/SignatureVerifierMuxer__factory.ts b/src/libs/abis/src/generated/custom/factories/SignatureVerifierMuxer__factory.ts
new file mode 100644
index 0000000000..e6b3971152
--- /dev/null
+++ b/src/libs/abis/src/generated/custom/factories/SignatureVerifierMuxer__factory.ts
@@ -0,0 +1,74 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+
+import { Contract, Signer, utils } from 'ethers'
+import type { Provider } from '@ethersproject/providers'
+import type { SignatureVerifierMuxer, SignatureVerifierMuxerInterface } from '../SignatureVerifierMuxer'
+
+const _abi = [
+  {
+    inputs: [
+      {
+        internalType: 'bytes32',
+        name: 'domainSeparator',
+        type: 'bytes32',
+      },
+      {
+        internalType: 'contract ISafeSignatureVerifier',
+        name: 'newVerifier',
+        type: 'address',
+      },
+    ],
+    name: 'setDomainVerifier',
+    outputs: [],
+    stateMutability: 'nonpayable',
+    type: 'function',
+  },
+  {
+    inputs: [
+      {
+        internalType: 'address',
+        name: 'handler',
+        type: 'address',
+      },
+    ],
+    name: 'setFallbackHandler',
+    outputs: [],
+    stateMutability: 'nonpayable',
+    type: 'function',
+  },
+  {
+    constant: true,
+    inputs: [
+      {
+        name: 'safe',
+        type: 'address',
+      },
+      {
+        name: 'domainSeparator',
+        type: 'bytes32',
+      },
+    ],
+    name: 'domainVerifiers',
+    outputs: [
+      {
+        name: '',
+        type: 'address',
+      },
+    ],
+    payable: false,
+    stateMutability: 'view',
+    type: 'function',
+  },
+] as const
+
+export class SignatureVerifierMuxer__factory {
+  static readonly abi = _abi
+  static createInterface(): SignatureVerifierMuxerInterface {
+    return new utils.Interface(_abi) as SignatureVerifierMuxerInterface
+  }
+  static connect(address: string, signerOrProvider: Signer | Provider): SignatureVerifierMuxer {
+    return new Contract(address, _abi, signerOrProvider) as SignatureVerifierMuxer
+  }
+}
diff --git a/src/libs/abis/src/generated/custom/factories/TokenDistro__factory.ts b/src/libs/abis/src/generated/custom/factories/TokenDistro__factory.ts
new file mode 100644
index 0000000000..c507d25af6
--- /dev/null
+++ b/src/libs/abis/src/generated/custom/factories/TokenDistro__factory.ts
@@ -0,0 +1,51 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+
+import { Contract, Signer, utils } from 'ethers'
+import type { Provider } from '@ethersproject/providers'
+import type { TokenDistro, TokenDistroInterface } from '../TokenDistro'
+
+const _abi = [
+  {
+    inputs: [
+      {
+        internalType: 'address',
+        name: '',
+        type: 'address',
+      },
+    ],
+    name: 'balances',
+    outputs: [
+      {
+        internalType: 'uint256',
+        name: 'allocatedTokens',
+        type: 'uint256',
+      },
+      {
+        internalType: 'uint256',
+        name: 'claimed',
+        type: 'uint256',
+      },
+    ],
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    inputs: [],
+    name: 'claim',
+    outputs: [],
+    stateMutability: 'nonpayable',
+    type: 'function',
+  },
+] as const
+
+export class TokenDistro__factory {
+  static readonly abi = _abi
+  static createInterface(): TokenDistroInterface {
+    return new utils.Interface(_abi) as TokenDistroInterface
+  }
+  static connect(address: string, signerOrProvider: Signer | Provider): TokenDistro {
+    return new Contract(address, _abi, signerOrProvider) as TokenDistro
+  }
+}
diff --git a/src/libs/abis/src/generated/custom/factories/VCow__factory.ts b/src/libs/abis/src/generated/custom/factories/VCow__factory.ts
new file mode 100644
index 0000000000..d386b0745c
--- /dev/null
+++ b/src/libs/abis/src/generated/custom/factories/VCow__factory.ts
@@ -0,0 +1,273 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+
+import { Contract, Signer, utils } from 'ethers'
+import type { Provider } from '@ethersproject/providers'
+import type { VCow, VCowInterface } from '../VCow'
+
+const _abi = [
+  {
+    anonymous: false,
+    inputs: [
+      {
+        indexed: false,
+        internalType: 'uint256',
+        name: 'index',
+        type: 'uint256',
+      },
+      {
+        indexed: false,
+        internalType: 'enum ClaimingInterface.ClaimType',
+        name: 'claimType',
+        type: 'uint8',
+      },
+      {
+        indexed: false,
+        internalType: 'address',
+        name: 'claimant',
+        type: 'address',
+      },
+      {
+        indexed: false,
+        internalType: 'uint256',
+        name: 'claimableAmount',
+        type: 'uint256',
+      },
+      {
+        indexed: false,
+        internalType: 'uint256',
+        name: 'claimedAmount',
+        type: 'uint256',
+      },
+    ],
+    name: 'Claimed',
+    type: 'event',
+  },
+  {
+    inputs: [
+      {
+        internalType: 'uint256',
+        name: 'index',
+        type: 'uint256',
+      },
+      {
+        internalType: 'enum ClaimingInterface.ClaimType',
+        name: 'claimType',
+        type: 'uint8',
+      },
+      {
+        internalType: 'address',
+        name: 'claimant',
+        type: 'address',
+      },
+      {
+        internalType: 'uint256',
+        name: 'claimableAmount',
+        type: 'uint256',
+      },
+      {
+        internalType: 'uint256',
+        name: 'claimedAmount',
+        type: 'uint256',
+      },
+      {
+        internalType: 'bytes32[]',
+        name: 'merkleProof',
+        type: 'bytes32[]',
+      },
+    ],
+    name: 'claim',
+    outputs: [],
+    stateMutability: 'payable',
+    type: 'function',
+  },
+  {
+    inputs: [
+      {
+        internalType: 'uint256[]',
+        name: 'indices',
+        type: 'uint256[]',
+      },
+      {
+        internalType: 'enum ClaimingInterface.ClaimType[]',
+        name: 'claimTypes',
+        type: 'uint8[]',
+      },
+      {
+        internalType: 'address[]',
+        name: 'claimants',
+        type: 'address[]',
+      },
+      {
+        internalType: 'uint256[]',
+        name: 'claimableAmounts',
+        type: 'uint256[]',
+      },
+      {
+        internalType: 'uint256[]',
+        name: 'claimedAmounts',
+        type: 'uint256[]',
+      },
+      {
+        internalType: 'bytes32[][]',
+        name: 'merkleProofs',
+        type: 'bytes32[][]',
+      },
+      {
+        internalType: 'uint256[]',
+        name: 'sentEth',
+        type: 'uint256[]',
+      },
+    ],
+    name: 'claimMany',
+    outputs: [],
+    stateMutability: 'payable',
+    type: 'function',
+  },
+  {
+    inputs: [
+      {
+        internalType: 'uint256',
+        name: 'index',
+        type: 'uint256',
+      },
+    ],
+    name: 'isClaimed',
+    outputs: [
+      {
+        internalType: 'bool',
+        name: '',
+        type: 'bool',
+      },
+    ],
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    inputs: [],
+    name: 'merkleRoot',
+    outputs: [
+      {
+        internalType: 'bytes32',
+        name: '',
+        type: 'bytes32',
+      },
+    ],
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    inputs: [],
+    name: 'deploymentTimestamp',
+    outputs: [
+      {
+        internalType: 'uint256',
+        name: '',
+        type: 'uint256',
+      },
+    ],
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    inputs: [],
+    name: 'gnoPrice',
+    outputs: [
+      {
+        internalType: 'uint256',
+        name: '',
+        type: 'uint256',
+      },
+    ],
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    inputs: [],
+    name: 'usdcPrice',
+    outputs: [
+      {
+        internalType: 'uint256',
+        name: '',
+        type: 'uint256',
+      },
+    ],
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    inputs: [],
+    name: 'nativeTokenPrice',
+    outputs: [
+      {
+        internalType: 'uint256',
+        name: '',
+        type: 'uint256',
+      },
+    ],
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    inputs: [
+      {
+        internalType: 'address',
+        name: 'user',
+        type: 'address',
+      },
+    ],
+    name: 'swappableBalanceOf',
+    outputs: [
+      {
+        internalType: 'uint256',
+        name: '',
+        type: 'uint256',
+      },
+    ],
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    inputs: [
+      {
+        internalType: 'address',
+        name: 'user',
+        type: 'address',
+      },
+    ],
+    name: 'balanceOf',
+    outputs: [
+      {
+        internalType: 'uint256',
+        name: '',
+        type: 'uint256',
+      },
+    ],
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    inputs: [],
+    name: 'swapAll',
+    outputs: [
+      {
+        internalType: 'uint256',
+        name: 'swappedBalance',
+        type: 'uint256',
+      },
+    ],
+    stateMutability: 'nonpayable',
+    type: 'function',
+  },
+] as const
+
+export class VCow__factory {
+  static readonly abi = _abi
+  static createInterface(): VCowInterface {
+    return new utils.Interface(_abi) as VCowInterface
+  }
+  static connect(address: string, signerOrProvider: Signer | Provider): VCow {
+    return new Contract(address, _abi, signerOrProvider) as VCow
+  }
+}
diff --git a/src/libs/abis/src/generated/custom/factories/index.ts b/src/libs/abis/src/generated/custom/factories/index.ts
new file mode 100644
index 0000000000..4456e72aac
--- /dev/null
+++ b/src/libs/abis/src/generated/custom/factories/index.ts
@@ -0,0 +1,10 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+export { ComposableCoW__factory } from './ComposableCoW__factory'
+export { ExtensibleFallbackHandler__factory } from './ExtensibleFallbackHandler__factory'
+export { GPv2Settlement__factory } from './GPv2Settlement__factory'
+export { MerkleDrop__factory } from './MerkleDrop__factory'
+export { SignatureVerifierMuxer__factory } from './SignatureVerifierMuxer__factory'
+export { TokenDistro__factory } from './TokenDistro__factory'
+export { VCow__factory } from './VCow__factory'
diff --git a/src/libs/abis/src/generated/custom/index.ts b/src/libs/abis/src/generated/custom/index.ts
new file mode 100644
index 0000000000..858162a683
--- /dev/null
+++ b/src/libs/abis/src/generated/custom/index.ts
@@ -0,0 +1,18 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+export type { ComposableCoW } from './ComposableCoW'
+export type { ExtensibleFallbackHandler } from './ExtensibleFallbackHandler'
+export type { GPv2Settlement } from './GPv2Settlement'
+export type { MerkleDrop } from './MerkleDrop'
+export type { SignatureVerifierMuxer } from './SignatureVerifierMuxer'
+export type { TokenDistro } from './TokenDistro'
+export type { VCow } from './VCow'
+export * as factories from './factories'
+export { ComposableCoW__factory } from './factories/ComposableCoW__factory'
+export { ExtensibleFallbackHandler__factory } from './factories/ExtensibleFallbackHandler__factory'
+export { GPv2Settlement__factory } from './factories/GPv2Settlement__factory'
+export { MerkleDrop__factory } from './factories/MerkleDrop__factory'
+export { SignatureVerifierMuxer__factory } from './factories/SignatureVerifierMuxer__factory'
+export { TokenDistro__factory } from './factories/TokenDistro__factory'
+export { VCow__factory } from './factories/VCow__factory'
diff --git a/src/libs/abis/src/generated/ethflow/CoWSwapEthFlow.ts b/src/libs/abis/src/generated/ethflow/CoWSwapEthFlow.ts
new file mode 100644
index 0000000000..0a9bf91a67
--- /dev/null
+++ b/src/libs/abis/src/generated/ethflow/CoWSwapEthFlow.ts
@@ -0,0 +1,448 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+import type {
+  BaseContract,
+  BigNumber,
+  BigNumberish,
+  BytesLike,
+  CallOverrides,
+  ContractTransaction,
+  Overrides,
+  PayableOverrides,
+  PopulatedTransaction,
+  Signer,
+  utils,
+} from 'ethers'
+import type { FunctionFragment, Result, EventFragment } from '@ethersproject/abi'
+import type { Listener, Provider } from '@ethersproject/providers'
+import type { TypedEventFilter, TypedEvent, TypedListener, OnEvent, PromiseOrValue } from './common'
+
+export declare namespace GPv2Order {
+  export type DataStruct = {
+    sellToken: PromiseOrValue<string>
+    buyToken: PromiseOrValue<string>
+    receiver: PromiseOrValue<string>
+    sellAmount: PromiseOrValue<BigNumberish>
+    buyAmount: PromiseOrValue<BigNumberish>
+    validTo: PromiseOrValue<BigNumberish>
+    appData: PromiseOrValue<BytesLike>
+    feeAmount: PromiseOrValue<BigNumberish>
+    kind: PromiseOrValue<BytesLike>
+    partiallyFillable: PromiseOrValue<boolean>
+    sellTokenBalance: PromiseOrValue<BytesLike>
+    buyTokenBalance: PromiseOrValue<BytesLike>
+  }
+
+  export type DataStructOutput = [
+    string,
+    string,
+    string,
+    BigNumber,
+    BigNumber,
+    number,
+    string,
+    BigNumber,
+    string,
+    boolean,
+    string,
+    string
+  ] & {
+    sellToken: string
+    buyToken: string
+    receiver: string
+    sellAmount: BigNumber
+    buyAmount: BigNumber
+    validTo: number
+    appData: string
+    feeAmount: BigNumber
+    kind: string
+    partiallyFillable: boolean
+    sellTokenBalance: string
+    buyTokenBalance: string
+  }
+}
+
+export declare namespace ICoWSwapOnchainOrders {
+  export type OnchainSignatureStruct = {
+    scheme: PromiseOrValue<BigNumberish>
+    data: PromiseOrValue<BytesLike>
+  }
+
+  export type OnchainSignatureStructOutput = [number, string] & {
+    scheme: number
+    data: string
+  }
+}
+
+export declare namespace EthFlowOrder {
+  export type DataStruct = {
+    buyToken: PromiseOrValue<string>
+    receiver: PromiseOrValue<string>
+    sellAmount: PromiseOrValue<BigNumberish>
+    buyAmount: PromiseOrValue<BigNumberish>
+    appData: PromiseOrValue<BytesLike>
+    feeAmount: PromiseOrValue<BigNumberish>
+    validTo: PromiseOrValue<BigNumberish>
+    partiallyFillable: PromiseOrValue<boolean>
+    quoteId: PromiseOrValue<BigNumberish>
+  }
+
+  export type DataStructOutput = [
+    string,
+    string,
+    BigNumber,
+    BigNumber,
+    string,
+    BigNumber,
+    number,
+    boolean,
+    BigNumber
+  ] & {
+    buyToken: string
+    receiver: string
+    sellAmount: BigNumber
+    buyAmount: BigNumber
+    appData: string
+    feeAmount: BigNumber
+    validTo: number
+    partiallyFillable: boolean
+    quoteId: BigNumber
+  }
+}
+
+export interface CoWSwapEthFlowInterface extends utils.Interface {
+  functions: {
+    'cowSwapSettlement()': FunctionFragment
+    'createOrder((address,address,uint256,uint256,bytes32,uint256,uint32,bool,int64))': FunctionFragment
+    'invalidateOrder((address,address,uint256,uint256,bytes32,uint256,uint32,bool,int64))': FunctionFragment
+    'invalidateOrdersIgnoringNotAllowed((address,address,uint256,uint256,bytes32,uint256,uint32,bool,int64)[])': FunctionFragment
+    'isValidSignature(bytes32,bytes)': FunctionFragment
+    'orders(bytes32)': FunctionFragment
+    'unwrap(uint256)': FunctionFragment
+    'wrap(uint256)': FunctionFragment
+    'wrapAll()': FunctionFragment
+    'wrappedNativeToken()': FunctionFragment
+  }
+
+  getFunction(
+    nameOrSignatureOrTopic:
+      | 'cowSwapSettlement'
+      | 'createOrder'
+      | 'invalidateOrder'
+      | 'invalidateOrdersIgnoringNotAllowed'
+      | 'isValidSignature'
+      | 'orders'
+      | 'unwrap'
+      | 'wrap'
+      | 'wrapAll'
+      | 'wrappedNativeToken'
+  ): FunctionFragment
+
+  encodeFunctionData(functionFragment: 'cowSwapSettlement', values?: undefined): string
+  encodeFunctionData(functionFragment: 'createOrder', values: [EthFlowOrder.DataStruct]): string
+  encodeFunctionData(functionFragment: 'invalidateOrder', values: [EthFlowOrder.DataStruct]): string
+  encodeFunctionData(
+    functionFragment: 'invalidateOrdersIgnoringNotAllowed',
+    values: [EthFlowOrder.DataStruct[]]
+  ): string
+  encodeFunctionData(
+    functionFragment: 'isValidSignature',
+    values: [PromiseOrValue<BytesLike>, PromiseOrValue<BytesLike>]
+  ): string
+  encodeFunctionData(functionFragment: 'orders', values: [PromiseOrValue<BytesLike>]): string
+  encodeFunctionData(functionFragment: 'unwrap', values: [PromiseOrValue<BigNumberish>]): string
+  encodeFunctionData(functionFragment: 'wrap', values: [PromiseOrValue<BigNumberish>]): string
+  encodeFunctionData(functionFragment: 'wrapAll', values?: undefined): string
+  encodeFunctionData(functionFragment: 'wrappedNativeToken', values?: undefined): string
+
+  decodeFunctionResult(functionFragment: 'cowSwapSettlement', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'createOrder', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'invalidateOrder', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'invalidateOrdersIgnoringNotAllowed', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'isValidSignature', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'orders', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'unwrap', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'wrap', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'wrapAll', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'wrappedNativeToken', data: BytesLike): Result
+
+  events: {
+    'OrderInvalidation(bytes)': EventFragment
+    'OrderPlacement(address,tuple,tuple,bytes)': EventFragment
+    'OrderRefund(bytes,address)': EventFragment
+  }
+
+  getEvent(nameOrSignatureOrTopic: 'OrderInvalidation'): EventFragment
+  getEvent(nameOrSignatureOrTopic: 'OrderPlacement'): EventFragment
+  getEvent(nameOrSignatureOrTopic: 'OrderRefund'): EventFragment
+}
+
+export interface OrderInvalidationEventObject {
+  orderUid: string
+}
+export type OrderInvalidationEvent = TypedEvent<[string], OrderInvalidationEventObject>
+
+export type OrderInvalidationEventFilter = TypedEventFilter<OrderInvalidationEvent>
+
+export interface OrderPlacementEventObject {
+  sender: string
+  order: GPv2Order.DataStructOutput
+  signature: ICoWSwapOnchainOrders.OnchainSignatureStructOutput
+  data: string
+}
+export type OrderPlacementEvent = TypedEvent<
+  [string, GPv2Order.DataStructOutput, ICoWSwapOnchainOrders.OnchainSignatureStructOutput, string],
+  OrderPlacementEventObject
+>
+
+export type OrderPlacementEventFilter = TypedEventFilter<OrderPlacementEvent>
+
+export interface OrderRefundEventObject {
+  orderUid: string
+  refunder: string
+}
+export type OrderRefundEvent = TypedEvent<[string, string], OrderRefundEventObject>
+
+export type OrderRefundEventFilter = TypedEventFilter<OrderRefundEvent>
+
+export interface CoWSwapEthFlow extends BaseContract {
+  connect(signerOrProvider: Signer | Provider | string): this
+  attach(addressOrName: string): this
+  deployed(): Promise<this>
+
+  interface: CoWSwapEthFlowInterface
+
+  queryFilter<TEvent extends TypedEvent>(
+    event: TypedEventFilter<TEvent>,
+    fromBlockOrBlockhash?: string | number | undefined,
+    toBlock?: string | number | undefined
+  ): Promise<Array<TEvent>>
+
+  listeners<TEvent extends TypedEvent>(eventFilter?: TypedEventFilter<TEvent>): Array<TypedListener<TEvent>>
+  listeners(eventName?: string): Array<Listener>
+  removeAllListeners<TEvent extends TypedEvent>(eventFilter: TypedEventFilter<TEvent>): this
+  removeAllListeners(eventName?: string): this
+  off: OnEvent<this>
+  on: OnEvent<this>
+  once: OnEvent<this>
+  removeListener: OnEvent<this>
+
+  functions: {
+    cowSwapSettlement(overrides?: CallOverrides): Promise<[string]>
+
+    createOrder(
+      order: EthFlowOrder.DataStruct,
+      overrides?: PayableOverrides & { from?: PromiseOrValue<string> }
+    ): Promise<ContractTransaction>
+
+    invalidateOrder(
+      order: EthFlowOrder.DataStruct,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<ContractTransaction>
+
+    invalidateOrdersIgnoringNotAllowed(
+      orderArray: EthFlowOrder.DataStruct[],
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<ContractTransaction>
+
+    isValidSignature(
+      orderHash: PromiseOrValue<BytesLike>,
+      arg1: PromiseOrValue<BytesLike>,
+      overrides?: CallOverrides
+    ): Promise<[string]>
+
+    orders(
+      arg0: PromiseOrValue<BytesLike>,
+      overrides?: CallOverrides
+    ): Promise<[string, number] & { owner: string; validTo: number }>
+
+    unwrap(
+      amount: PromiseOrValue<BigNumberish>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<ContractTransaction>
+
+    wrap(
+      amount: PromiseOrValue<BigNumberish>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<ContractTransaction>
+
+    wrapAll(overrides?: Overrides & { from?: PromiseOrValue<string> }): Promise<ContractTransaction>
+
+    wrappedNativeToken(overrides?: CallOverrides): Promise<[string]>
+  }
+
+  cowSwapSettlement(overrides?: CallOverrides): Promise<string>
+
+  createOrder(
+    order: EthFlowOrder.DataStruct,
+    overrides?: PayableOverrides & { from?: PromiseOrValue<string> }
+  ): Promise<ContractTransaction>
+
+  invalidateOrder(
+    order: EthFlowOrder.DataStruct,
+    overrides?: Overrides & { from?: PromiseOrValue<string> }
+  ): Promise<ContractTransaction>
+
+  invalidateOrdersIgnoringNotAllowed(
+    orderArray: EthFlowOrder.DataStruct[],
+    overrides?: Overrides & { from?: PromiseOrValue<string> }
+  ): Promise<ContractTransaction>
+
+  isValidSignature(
+    orderHash: PromiseOrValue<BytesLike>,
+    arg1: PromiseOrValue<BytesLike>,
+    overrides?: CallOverrides
+  ): Promise<string>
+
+  orders(
+    arg0: PromiseOrValue<BytesLike>,
+    overrides?: CallOverrides
+  ): Promise<[string, number] & { owner: string; validTo: number }>
+
+  unwrap(
+    amount: PromiseOrValue<BigNumberish>,
+    overrides?: Overrides & { from?: PromiseOrValue<string> }
+  ): Promise<ContractTransaction>
+
+  wrap(
+    amount: PromiseOrValue<BigNumberish>,
+    overrides?: Overrides & { from?: PromiseOrValue<string> }
+  ): Promise<ContractTransaction>
+
+  wrapAll(overrides?: Overrides & { from?: PromiseOrValue<string> }): Promise<ContractTransaction>
+
+  wrappedNativeToken(overrides?: CallOverrides): Promise<string>
+
+  callStatic: {
+    cowSwapSettlement(overrides?: CallOverrides): Promise<string>
+
+    createOrder(order: EthFlowOrder.DataStruct, overrides?: CallOverrides): Promise<string>
+
+    invalidateOrder(order: EthFlowOrder.DataStruct, overrides?: CallOverrides): Promise<void>
+
+    invalidateOrdersIgnoringNotAllowed(orderArray: EthFlowOrder.DataStruct[], overrides?: CallOverrides): Promise<void>
+
+    isValidSignature(
+      orderHash: PromiseOrValue<BytesLike>,
+      arg1: PromiseOrValue<BytesLike>,
+      overrides?: CallOverrides
+    ): Promise<string>
+
+    orders(
+      arg0: PromiseOrValue<BytesLike>,
+      overrides?: CallOverrides
+    ): Promise<[string, number] & { owner: string; validTo: number }>
+
+    unwrap(amount: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>
+
+    wrap(amount: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>
+
+    wrapAll(overrides?: CallOverrides): Promise<void>
+
+    wrappedNativeToken(overrides?: CallOverrides): Promise<string>
+  }
+
+  filters: {
+    'OrderInvalidation(bytes)'(orderUid?: null): OrderInvalidationEventFilter
+    OrderInvalidation(orderUid?: null): OrderInvalidationEventFilter
+
+    'OrderPlacement(address,tuple,tuple,bytes)'(
+      sender?: PromiseOrValue<string> | null,
+      order?: null,
+      signature?: null,
+      data?: null
+    ): OrderPlacementEventFilter
+    OrderPlacement(
+      sender?: PromiseOrValue<string> | null,
+      order?: null,
+      signature?: null,
+      data?: null
+    ): OrderPlacementEventFilter
+
+    'OrderRefund(bytes,address)'(orderUid?: null, refunder?: PromiseOrValue<string> | null): OrderRefundEventFilter
+    OrderRefund(orderUid?: null, refunder?: PromiseOrValue<string> | null): OrderRefundEventFilter
+  }
+
+  estimateGas: {
+    cowSwapSettlement(overrides?: CallOverrides): Promise<BigNumber>
+
+    createOrder(
+      order: EthFlowOrder.DataStruct,
+      overrides?: PayableOverrides & { from?: PromiseOrValue<string> }
+    ): Promise<BigNumber>
+
+    invalidateOrder(
+      order: EthFlowOrder.DataStruct,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<BigNumber>
+
+    invalidateOrdersIgnoringNotAllowed(
+      orderArray: EthFlowOrder.DataStruct[],
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<BigNumber>
+
+    isValidSignature(
+      orderHash: PromiseOrValue<BytesLike>,
+      arg1: PromiseOrValue<BytesLike>,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>
+
+    orders(arg0: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<BigNumber>
+
+    unwrap(
+      amount: PromiseOrValue<BigNumberish>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<BigNumber>
+
+    wrap(
+      amount: PromiseOrValue<BigNumberish>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<BigNumber>
+
+    wrapAll(overrides?: Overrides & { from?: PromiseOrValue<string> }): Promise<BigNumber>
+
+    wrappedNativeToken(overrides?: CallOverrides): Promise<BigNumber>
+  }
+
+  populateTransaction: {
+    cowSwapSettlement(overrides?: CallOverrides): Promise<PopulatedTransaction>
+
+    createOrder(
+      order: EthFlowOrder.DataStruct,
+      overrides?: PayableOverrides & { from?: PromiseOrValue<string> }
+    ): Promise<PopulatedTransaction>
+
+    invalidateOrder(
+      order: EthFlowOrder.DataStruct,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<PopulatedTransaction>
+
+    invalidateOrdersIgnoringNotAllowed(
+      orderArray: EthFlowOrder.DataStruct[],
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<PopulatedTransaction>
+
+    isValidSignature(
+      orderHash: PromiseOrValue<BytesLike>,
+      arg1: PromiseOrValue<BytesLike>,
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>
+
+    orders(arg0: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<PopulatedTransaction>
+
+    unwrap(
+      amount: PromiseOrValue<BigNumberish>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<PopulatedTransaction>
+
+    wrap(
+      amount: PromiseOrValue<BigNumberish>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<PopulatedTransaction>
+
+    wrapAll(overrides?: Overrides & { from?: PromiseOrValue<string> }): Promise<PopulatedTransaction>
+
+    wrappedNativeToken(overrides?: CallOverrides): Promise<PopulatedTransaction>
+  }
+}
diff --git a/src/libs/abis/src/generated/ethflow/common.ts b/src/libs/abis/src/generated/ethflow/common.ts
new file mode 100644
index 0000000000..5d37e711b7
--- /dev/null
+++ b/src/libs/abis/src/generated/ethflow/common.ts
@@ -0,0 +1,32 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+import type { Listener } from '@ethersproject/providers'
+import type { Event, EventFilter } from 'ethers'
+
+export interface TypedEvent<TArgsArray extends Array<any> = any, TArgsObject = any> extends Event {
+  args: TArgsArray & TArgsObject
+}
+
+export interface TypedEventFilter<_TEvent extends TypedEvent> extends EventFilter {}
+
+export interface TypedListener<TEvent extends TypedEvent> {
+  (...listenerArg: [...__TypechainArgsArray<TEvent>, TEvent]): void
+}
+
+type __TypechainArgsArray<T> = T extends TypedEvent<infer U> ? U : never
+
+export interface OnEvent<TRes> {
+  <TEvent extends TypedEvent>(eventFilter: TypedEventFilter<TEvent>, listener: TypedListener<TEvent>): TRes
+  (eventName: string, listener: Listener): TRes
+}
+
+export type MinEthersFactory<C, ARGS> = {
+  deploy(...a: ARGS[]): Promise<C>
+}
+
+export type GetContractTypeFromFactory<F> = F extends MinEthersFactory<infer C, any> ? C : never
+
+export type GetARGsTypeFromFactory<F> = F extends MinEthersFactory<any, any> ? Parameters<F['deploy']> : never
+
+export type PromiseOrValue<T> = T | Promise<T>
diff --git a/src/libs/abis/src/generated/ethflow/factories/CoWSwapEthFlow__factory.ts b/src/libs/abis/src/generated/ethflow/factories/CoWSwapEthFlow__factory.ts
new file mode 100644
index 0000000000..498c015f4b
--- /dev/null
+++ b/src/libs/abis/src/generated/ethflow/factories/CoWSwapEthFlow__factory.ts
@@ -0,0 +1,555 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+import { Signer, utils, Contract, ContractFactory, Overrides } from 'ethers'
+import type { Provider, TransactionRequest } from '@ethersproject/providers'
+import type { PromiseOrValue } from '../common'
+import type { CoWSwapEthFlow, CoWSwapEthFlowInterface } from '../CoWSwapEthFlow'
+
+const _abi = [
+  {
+    inputs: [
+      {
+        internalType: 'contract ICoWSwapSettlement',
+        name: '_cowSwapSettlement',
+        type: 'address',
+      },
+      {
+        internalType: 'contract IWrappedNativeToken',
+        name: '_wrappedNativeToken',
+        type: 'address',
+      },
+    ],
+    stateMutability: 'nonpayable',
+    type: 'constructor',
+  },
+  {
+    inputs: [],
+    name: 'EthTransferFailed',
+    type: 'error',
+  },
+  {
+    inputs: [],
+    name: 'IncorrectEthAmount',
+    type: 'error',
+  },
+  {
+    inputs: [
+      {
+        internalType: 'bytes32',
+        name: 'orderHash',
+        type: 'bytes32',
+      },
+    ],
+    name: 'NotAllowedToInvalidateOrder',
+    type: 'error',
+  },
+  {
+    inputs: [],
+    name: 'NotAllowedZeroSellAmount',
+    type: 'error',
+  },
+  {
+    inputs: [],
+    name: 'OrderIsAlreadyExpired',
+    type: 'error',
+  },
+  {
+    inputs: [
+      {
+        internalType: 'bytes32',
+        name: 'orderHash',
+        type: 'bytes32',
+      },
+    ],
+    name: 'OrderIsAlreadyOwned',
+    type: 'error',
+  },
+  {
+    inputs: [],
+    name: 'ReceiverMustBeSet',
+    type: 'error',
+  },
+  {
+    anonymous: false,
+    inputs: [
+      {
+        indexed: false,
+        internalType: 'bytes',
+        name: 'orderUid',
+        type: 'bytes',
+      },
+    ],
+    name: 'OrderInvalidation',
+    type: 'event',
+  },
+  {
+    anonymous: false,
+    inputs: [
+      {
+        indexed: true,
+        internalType: 'address',
+        name: 'sender',
+        type: 'address',
+      },
+      {
+        components: [
+          {
+            internalType: 'contract IERC20',
+            name: 'sellToken',
+            type: 'address',
+          },
+          {
+            internalType: 'contract IERC20',
+            name: 'buyToken',
+            type: 'address',
+          },
+          {
+            internalType: 'address',
+            name: 'receiver',
+            type: 'address',
+          },
+          {
+            internalType: 'uint256',
+            name: 'sellAmount',
+            type: 'uint256',
+          },
+          {
+            internalType: 'uint256',
+            name: 'buyAmount',
+            type: 'uint256',
+          },
+          {
+            internalType: 'uint32',
+            name: 'validTo',
+            type: 'uint32',
+          },
+          {
+            internalType: 'bytes32',
+            name: 'appData',
+            type: 'bytes32',
+          },
+          {
+            internalType: 'uint256',
+            name: 'feeAmount',
+            type: 'uint256',
+          },
+          {
+            internalType: 'bytes32',
+            name: 'kind',
+            type: 'bytes32',
+          },
+          {
+            internalType: 'bool',
+            name: 'partiallyFillable',
+            type: 'bool',
+          },
+          {
+            internalType: 'bytes32',
+            name: 'sellTokenBalance',
+            type: 'bytes32',
+          },
+          {
+            internalType: 'bytes32',
+            name: 'buyTokenBalance',
+            type: 'bytes32',
+          },
+        ],
+        indexed: false,
+        internalType: 'struct GPv2Order.Data',
+        name: 'order',
+        type: 'tuple',
+      },
+      {
+        components: [
+          {
+            internalType: 'enum ICoWSwapOnchainOrders.OnchainSigningScheme',
+            name: 'scheme',
+            type: 'uint8',
+          },
+          {
+            internalType: 'bytes',
+            name: 'data',
+            type: 'bytes',
+          },
+        ],
+        indexed: false,
+        internalType: 'struct ICoWSwapOnchainOrders.OnchainSignature',
+        name: 'signature',
+        type: 'tuple',
+      },
+      {
+        indexed: false,
+        internalType: 'bytes',
+        name: 'data',
+        type: 'bytes',
+      },
+    ],
+    name: 'OrderPlacement',
+    type: 'event',
+  },
+  {
+    anonymous: false,
+    inputs: [
+      {
+        indexed: false,
+        internalType: 'bytes',
+        name: 'orderUid',
+        type: 'bytes',
+      },
+      {
+        indexed: true,
+        internalType: 'address',
+        name: 'refunder',
+        type: 'address',
+      },
+    ],
+    name: 'OrderRefund',
+    type: 'event',
+  },
+  {
+    inputs: [],
+    name: 'cowSwapSettlement',
+    outputs: [
+      {
+        internalType: 'contract ICoWSwapSettlement',
+        name: '',
+        type: 'address',
+      },
+    ],
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    inputs: [
+      {
+        components: [
+          {
+            internalType: 'contract IERC20',
+            name: 'buyToken',
+            type: 'address',
+          },
+          {
+            internalType: 'address',
+            name: 'receiver',
+            type: 'address',
+          },
+          {
+            internalType: 'uint256',
+            name: 'sellAmount',
+            type: 'uint256',
+          },
+          {
+            internalType: 'uint256',
+            name: 'buyAmount',
+            type: 'uint256',
+          },
+          {
+            internalType: 'bytes32',
+            name: 'appData',
+            type: 'bytes32',
+          },
+          {
+            internalType: 'uint256',
+            name: 'feeAmount',
+            type: 'uint256',
+          },
+          {
+            internalType: 'uint32',
+            name: 'validTo',
+            type: 'uint32',
+          },
+          {
+            internalType: 'bool',
+            name: 'partiallyFillable',
+            type: 'bool',
+          },
+          {
+            internalType: 'int64',
+            name: 'quoteId',
+            type: 'int64',
+          },
+        ],
+        internalType: 'struct EthFlowOrder.Data',
+        name: 'order',
+        type: 'tuple',
+      },
+    ],
+    name: 'createOrder',
+    outputs: [
+      {
+        internalType: 'bytes32',
+        name: 'orderHash',
+        type: 'bytes32',
+      },
+    ],
+    stateMutability: 'payable',
+    type: 'function',
+  },
+  {
+    inputs: [
+      {
+        components: [
+          {
+            internalType: 'contract IERC20',
+            name: 'buyToken',
+            type: 'address',
+          },
+          {
+            internalType: 'address',
+            name: 'receiver',
+            type: 'address',
+          },
+          {
+            internalType: 'uint256',
+            name: 'sellAmount',
+            type: 'uint256',
+          },
+          {
+            internalType: 'uint256',
+            name: 'buyAmount',
+            type: 'uint256',
+          },
+          {
+            internalType: 'bytes32',
+            name: 'appData',
+            type: 'bytes32',
+          },
+          {
+            internalType: 'uint256',
+            name: 'feeAmount',
+            type: 'uint256',
+          },
+          {
+            internalType: 'uint32',
+            name: 'validTo',
+            type: 'uint32',
+          },
+          {
+            internalType: 'bool',
+            name: 'partiallyFillable',
+            type: 'bool',
+          },
+          {
+            internalType: 'int64',
+            name: 'quoteId',
+            type: 'int64',
+          },
+        ],
+        internalType: 'struct EthFlowOrder.Data',
+        name: 'order',
+        type: 'tuple',
+      },
+    ],
+    name: 'invalidateOrder',
+    outputs: [],
+    stateMutability: 'nonpayable',
+    type: 'function',
+  },
+  {
+    inputs: [
+      {
+        components: [
+          {
+            internalType: 'contract IERC20',
+            name: 'buyToken',
+            type: 'address',
+          },
+          {
+            internalType: 'address',
+            name: 'receiver',
+            type: 'address',
+          },
+          {
+            internalType: 'uint256',
+            name: 'sellAmount',
+            type: 'uint256',
+          },
+          {
+            internalType: 'uint256',
+            name: 'buyAmount',
+            type: 'uint256',
+          },
+          {
+            internalType: 'bytes32',
+            name: 'appData',
+            type: 'bytes32',
+          },
+          {
+            internalType: 'uint256',
+            name: 'feeAmount',
+            type: 'uint256',
+          },
+          {
+            internalType: 'uint32',
+            name: 'validTo',
+            type: 'uint32',
+          },
+          {
+            internalType: 'bool',
+            name: 'partiallyFillable',
+            type: 'bool',
+          },
+          {
+            internalType: 'int64',
+            name: 'quoteId',
+            type: 'int64',
+          },
+        ],
+        internalType: 'struct EthFlowOrder.Data[]',
+        name: 'orderArray',
+        type: 'tuple[]',
+      },
+    ],
+    name: 'invalidateOrdersIgnoringNotAllowed',
+    outputs: [],
+    stateMutability: 'nonpayable',
+    type: 'function',
+  },
+  {
+    inputs: [
+      {
+        internalType: 'bytes32',
+        name: 'orderHash',
+        type: 'bytes32',
+      },
+      {
+        internalType: 'bytes',
+        name: '',
+        type: 'bytes',
+      },
+    ],
+    name: 'isValidSignature',
+    outputs: [
+      {
+        internalType: 'bytes4',
+        name: '',
+        type: 'bytes4',
+      },
+    ],
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    inputs: [
+      {
+        internalType: 'bytes32',
+        name: '',
+        type: 'bytes32',
+      },
+    ],
+    name: 'orders',
+    outputs: [
+      {
+        internalType: 'address',
+        name: 'owner',
+        type: 'address',
+      },
+      {
+        internalType: 'uint32',
+        name: 'validTo',
+        type: 'uint32',
+      },
+    ],
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    inputs: [
+      {
+        internalType: 'uint256',
+        name: 'amount',
+        type: 'uint256',
+      },
+    ],
+    name: 'unwrap',
+    outputs: [],
+    stateMutability: 'nonpayable',
+    type: 'function',
+  },
+  {
+    inputs: [
+      {
+        internalType: 'uint256',
+        name: 'amount',
+        type: 'uint256',
+      },
+    ],
+    name: 'wrap',
+    outputs: [],
+    stateMutability: 'nonpayable',
+    type: 'function',
+  },
+  {
+    inputs: [],
+    name: 'wrapAll',
+    outputs: [],
+    stateMutability: 'nonpayable',
+    type: 'function',
+  },
+  {
+    inputs: [],
+    name: 'wrappedNativeToken',
+    outputs: [
+      {
+        internalType: 'contract IWrappedNativeToken',
+        name: '',
+        type: 'address',
+      },
+    ],
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    stateMutability: 'payable',
+    type: 'receive',
+  },
+] as const
+
+const _bytecode =
+  '0x60e06040523480156200001157600080fd5b5060405162001b2a38038062001b2a83398101604081905262000034916200021e565b816200004b816200015260201b6200089b1760201c565b608052506001600160a01b0380831660a081905290821660c081905260408051634daa966160e11b81529051919263095ea7b3929091639b552cc291600480830192602092919082900301816000875af1158015620000ae573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620000d491906200025d565b6040516001600160e01b031960e084901b1681526001600160a01b03909116600482015260001960248201526044016020604051808303816000875af115801562000123573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019062000149919062000284565b505050620002a8565b604080517f8b73c3c69bb8fe3d512ecc4cf759cc79239f7b179b0ffacaa9a75d522b39400f60208201527f6c85c0337eba1661327f94f3bf46c8a7f9311a563f4d5c948362567f5d8ed60c918101919091527ff9446b8e937d86f0bc87cac73923491692b123ca5f8761908494703758206adf606082015246608082018190526001600160a01b03831660a083015260009160c00160405160208183030381529060405280519060200120915050919050565b6001600160a01b03811681146200021b57600080fd5b50565b600080604083850312156200023257600080fd5b82516200023f8162000205565b6020840151909250620002528162000205565b809150509250929050565b6000602082840312156200027057600080fd5b81516200027d8162000205565b9392505050565b6000602082840312156200029757600080fd5b815180151581146200027d57600080fd5b60805160a05160c0516118216200030960003960008181610129015281816105ff015281816107ad0152818161082501528181610c3301526110310152600081816102ce0152610f4b015260008181610bf70152610cd901526118216000f3fe6080604052600436106100b55760003560e01c80637bc41b9611610069578063de0e9a3e1161004e578063de0e9a3e1461027c578063ea598cb01461029c578063ec30bb88146102bc57600080fd5b80637bc41b96146101c85780639c3f1e90146101e857600080fd5b8063322bba211161009a578063322bba21146101705780634c84c1c8146101915780634cb76498146101a857600080fd5b80631626ba7e146100c157806317fcb39b1461011757600080fd5b366100bc57005b600080fd5b3480156100cd57600080fd5b506100e16100dc36600461126e565b6102f0565b6040517fffffffff0000000000000000000000000000000000000000000000000000000090911681526020015b60405180910390f35b34801561012357600080fd5b5061014b7f000000000000000000000000000000000000000000000000000000000000000081565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200161010e565b61018361017e36600461132b565b6103de565b60405190815260200161010e565b34801561019d57600080fd5b506101a6610720565b005b3480156101b457600080fd5b506101a66101c3366004611344565b61072b565b3480156101d457600080fd5b506101a66101e336600461132b565b610770565b3480156101f457600080fd5b5061024b6102033660046113ba565b60006020819052908152604090205473ffffffffffffffffffffffffffffffffffffffff81169074010000000000000000000000000000000000000000900463ffffffff1682565b6040805173ffffffffffffffffffffffffffffffffffffffff909316835263ffffffff90911660208301520161010e565b34801561028857600080fd5b506101a66102973660046113ba565b61077e565b3480156102a857600080fd5b506101a66102b73660046113ba565b610821565b3480156102c857600080fd5b5061014b7f000000000000000000000000000000000000000000000000000000000000000081565b60008281526020818152604080832081518083019092525473ffffffffffffffffffffffffffffffffffffffff81168083527401000000000000000000000000000000000000000090910463ffffffff1692820192909252901580159061036f5750805173ffffffffffffffffffffffffffffffffffffffff90811614155b8015610385575042816020015163ffffffff1610155b156103b357507f1626ba7e0000000000000000000000000000000000000000000000000000000090506103d8565b507fffffffff0000000000000000000000000000000000000000000000000000000090505b92915050565b60006103f260a08301356040840135611402565b341461042a576040517f8b6ebb4d00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b8160400135600003610468576040517feaec5c9d00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b4261047960e0840160c0850161142e565b63ffffffff1610156104b7576040517f89bb260100000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60408051808201909152338152600090602081016104db60e0860160c0870161142e565b63ffffffff169052604080518082019091529091506000908082815260200130604051602001610536919060609190911b7fffffffffffffffffffffffffffffffffffffffff00000000000000000000000016815260140190565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe081840301815291905290529050600061057c61012086016101008701611462565b6020808501516040516105c393920160c09290921b825260e01b7fffffffff00000000000000000000000000000000000000000000000000000000166008820152600c0190565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0818403018152919052835190915061063a906106337f000000000000000000000000000000000000000000000000000000000000000061062d368a90038a018a6114b1565b9061095b565b8484610b2a565b60008181526020819052604090205490945073ffffffffffffffffffffffffffffffffffffffff16156106a1576040517f56a1d2b2000000000000000000000000000000000000000000000000000000008152600481018590526024015b60405180910390fd5b505060008281526020818152604090912082518154929093015163ffffffff1674010000000000000000000000000000000000000000027fffffffffffffffff00000000000000000000000000000000000000000000000090921673ffffffffffffffffffffffffffffffffffffffff90931692909217179055919050565b61072947610821565b565b60005b8181101561076b5761075983838381811061074b5761074b61154b565b905061012002016000610c2c565b806107638161157a565b91505061072e565b505050565b61077b816001610c2c565b50565b6040517f2e1a7d4d000000000000000000000000000000000000000000000000000000008152600481018290527f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff1690632e1a7d4d90602401600060405180830381600087803b15801561080657600080fd5b505af115801561081a573d6000803e3d6000fd5b5050505050565b60007f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff168260405160006040518083038185875af1925050503d806000811461081a576040519150601f19603f3d011682016040523d82523d6000602084013e61081a565b604080517f8b73c3c69bb8fe3d512ecc4cf759cc79239f7b179b0ffacaa9a75d522b39400f60208201527f6c85c0337eba1661327f94f3bf46c8a7f9311a563f4d5c948362567f5d8ed60c918101919091527ff9446b8e937d86f0bc87cac73923491692b123ca5f8761908494703758206adf6060820152466080820181905273ffffffffffffffffffffffffffffffffffffffff831660a083015260009160c00160405160208183030381529060405280519060200120915050919050565b604080516101808101825260008082526020808301829052928201819052606082018190526080820181905260a0820181905260c0820181905260e082018190526101008201819052610120820181905261014082018190526101608201529083015173ffffffffffffffffffffffffffffffffffffffff16610a0a576040517fefc9ccdf00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6040518061018001604052808373ffffffffffffffffffffffffffffffffffffffff168152602001846000015173ffffffffffffffffffffffffffffffffffffffff168152602001846020015173ffffffffffffffffffffffffffffffffffffffff168152602001846040015181526020018460600151815260200163ffffffff80168152602001846080015181526020018460a0015181526020017ff3b277728b3fee749481eb3e0b3b48980dbbab78658fc419025cb16eee34677581526020018460e00151151581526020017f5a28e9363bb942b639270062aa6bb295f434bcdfc42c97267bf003f272060dc981526020017f5a28e9363bb942b639270062aa6bb295f434bcdfc42c97267bf003f272060dc9815250905092915050565b60008473ffffffffffffffffffffffffffffffffffffffff167fcf5f9de2984132265203b5c335b25727702ca77262ff622e136baa7362bf1da9858585604051610b7693929190611676565b60405180910390a25050507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe00180517fd5a25ba2e97094ad7d83dc28a6572da797d6b3e7fc6663bd93efb789fc17e48982526101a0822091526040517f190100000000000000000000000000000000000000000000000000000000000081527f00000000000000000000000000000000000000000000000000000000000000006002820152602281019190915260429020919050565b6000610c617f000000000000000000000000000000000000000000000000000000000000000061062d368690038601866114b1565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0810180517fd5a25ba2e97094ad7d83dc28a6572da797d6b3e7fc6663bd93efb789fc17e48982526101a082209152604080517f190100000000000000000000000000000000000000000000000000000000000081527f0000000000000000000000000000000000000000000000000000000000000000600282015260228101929092526042909120600081815260208181529083902083518085019094525473ffffffffffffffffffffffffffffffffffffffff8082168086527401000000000000000000000000000000000000000090920463ffffffff1692850183905294955091934290911015911480610d8d5750815173ffffffffffffffffffffffffffffffffffffffff16155b80610db75750808015610db75750815173ffffffffffffffffffffffffffffffffffffffff163314155b15610dff578415610df7576040517ff8cc70ce00000000000000000000000000000000000000000000000000000000815260048101849052602401610698565b505050505050565b60008381526020818152604080832080547fffffffffffffffffffffffff00000000000000000000000000000000000000001673ffffffffffffffffffffffffffffffffffffffff1790558051603880825260608201909252918201818036833750505060a0860151909150610e7a90829086903090611149565b8115610ebc577fb8bad102ac8bbacfef31ff1c906ec6d951c230b4dce750bb0376b812ad35852a81604051610eaf9190611790565b60405180910390a1610f0b565b3373ffffffffffffffffffffffffffffffffffffffff167f195271068a288191e4b265c641a56b9832919f69e9e7d6c2f31ba40278aeb85a82604051610f029190611790565b60405180910390a25b6040517f2479fb6e00000000000000000000000000000000000000000000000000000000815260009073ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000001690632479fb6e90610f80908590600401611790565b6020604051808303816000875af1158015610f9f573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610fc391906117a3565b90506000808760600151838960e001510281610fe157610fe16117bc565b048860e00151039050808389606001510301915050804710156110a4576040517f2e1a7d4d00000000000000000000000000000000000000000000000000000000815247820360048201819052907f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff1690632e1a7d4d90602401600060405180830381600087803b15801561108a57600080fd5b505af115801561109e573d6000803e3d6000fd5b50505050505b845160405160009173ffffffffffffffffffffffffffffffffffffffff169083908381818185875af1925050503d80600081146110fd576040519150601f19603f3d011682016040523d82523d6000602084013e611102565b606091505b505090508061113d576040517f6d963f8800000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b50505050505050505050565b60388451146111b4576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601960248201527f475076323a2075696420627566666572206f766572666c6f77000000000000006044820152606401610698565b60388401526034830152602090910152565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b604051610120810167ffffffffffffffff81118282101715611219576112196111c6565b60405290565b604051601f82017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe016810167ffffffffffffffff81118282101715611266576112666111c6565b604052919050565b6000806040838503121561128157600080fd5b8235915060208084013567ffffffffffffffff808211156112a157600080fd5b818601915086601f8301126112b557600080fd5b8135818111156112c7576112c76111c6565b6112f7847fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0601f8401160161121f565b9150808252878482850101111561130d57600080fd5b80848401858401376000848284010152508093505050509250929050565b6000610120828403121561133e57600080fd5b50919050565b6000806020838503121561135757600080fd5b823567ffffffffffffffff8082111561136f57600080fd5b818501915085601f83011261138357600080fd5b81358181111561139257600080fd5b866020610120830285010111156113a857600080fd5b60209290920196919550909350505050565b6000602082840312156113cc57600080fd5b5035919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b808201808211156103d8576103d86113d3565b803563ffffffff8116811461142957600080fd5b919050565b60006020828403121561144057600080fd5b61144982611415565b9392505050565b8035600781900b811461142957600080fd5b60006020828403121561147457600080fd5b61144982611450565b803573ffffffffffffffffffffffffffffffffffffffff8116811461142957600080fd5b8035801515811461142957600080fd5b600061012082840312156114c457600080fd5b6114cc6111f5565b6114d58361147d565b81526114e36020840161147d565b602082015260408301356040820152606083013560608201526080830135608082015260a083013560a082015261151c60c08401611415565b60c082015261152d60e084016114a1565b60e0820152610100611540818501611450565b908201529392505050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff82036115ab576115ab6113d3565b5060010190565b6000815180845260005b818110156115d8576020818501810151868301820152016115bc565b5060006020828601015260207fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0601f83011685010191505092915050565b6000815160028110611651577f4e487b7100000000000000000000000000000000000000000000000000000000600052602160045260246000fd5b8084525060208201516040602085015261166e60408501826115b2565b949350505050565b835173ffffffffffffffffffffffffffffffffffffffff16815260006101c060208601516116bc602085018273ffffffffffffffffffffffffffffffffffffffff169052565b5060408601516116e4604085018273ffffffffffffffffffffffffffffffffffffffff169052565b50606086015160608401526080860151608084015260a086015161171060a085018263ffffffff169052565b5060c086015160c084015260e086015160e0840152610100808701518185015250610120808701516117458286018215159052565b505061014086810151908401526101608087015190840152610180830181905261177181840186611616565b90508281036101a084015261178681856115b2565b9695505050505050565b60208152600061144960208301846115b2565b6000602082840312156117b557600080fd5b5051919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fdfea2646970667358221220dd6ac68dca08d6be1c4da0e828b663868839c2a8d206f54f6cae8f64c576247564736f6c63430008100033'
+
+type CoWSwapEthFlowConstructorParams = [signer?: Signer] | ConstructorParameters<typeof ContractFactory>
+
+const isSuperArgs = (xs: CoWSwapEthFlowConstructorParams): xs is ConstructorParameters<typeof ContractFactory> =>
+  xs.length > 1
+
+export class CoWSwapEthFlow__factory extends ContractFactory {
+  constructor(...args: CoWSwapEthFlowConstructorParams) {
+    if (isSuperArgs(args)) {
+      super(...args)
+    } else {
+      super(_abi, _bytecode, args[0])
+    }
+  }
+
+  override deploy(
+    _cowSwapSettlement: PromiseOrValue<string>,
+    _wrappedNativeToken: PromiseOrValue<string>,
+    overrides?: Overrides & { from?: PromiseOrValue<string> }
+  ): Promise<CoWSwapEthFlow> {
+    return super.deploy(_cowSwapSettlement, _wrappedNativeToken, overrides || {}) as Promise<CoWSwapEthFlow>
+  }
+  override getDeployTransaction(
+    _cowSwapSettlement: PromiseOrValue<string>,
+    _wrappedNativeToken: PromiseOrValue<string>,
+    overrides?: Overrides & { from?: PromiseOrValue<string> }
+  ): TransactionRequest {
+    return super.getDeployTransaction(_cowSwapSettlement, _wrappedNativeToken, overrides || {})
+  }
+  override attach(address: string): CoWSwapEthFlow {
+    return super.attach(address) as CoWSwapEthFlow
+  }
+  override connect(signer: Signer): CoWSwapEthFlow__factory {
+    return super.connect(signer) as CoWSwapEthFlow__factory
+  }
+
+  static readonly bytecode = _bytecode
+  static readonly abi = _abi
+  static createInterface(): CoWSwapEthFlowInterface {
+    return new utils.Interface(_abi) as CoWSwapEthFlowInterface
+  }
+  static connect(address: string, signerOrProvider: Signer | Provider): CoWSwapEthFlow {
+    return new Contract(address, _abi, signerOrProvider) as CoWSwapEthFlow
+  }
+}
diff --git a/src/libs/abis/src/generated/ethflow/factories/index.ts b/src/libs/abis/src/generated/ethflow/factories/index.ts
new file mode 100644
index 0000000000..3eb3983441
--- /dev/null
+++ b/src/libs/abis/src/generated/ethflow/factories/index.ts
@@ -0,0 +1,4 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+export { CoWSwapEthFlow__factory } from './CoWSwapEthFlow__factory'
diff --git a/src/libs/abis/src/generated/ethflow/index.ts b/src/libs/abis/src/generated/ethflow/index.ts
new file mode 100644
index 0000000000..abf8eecbe8
--- /dev/null
+++ b/src/libs/abis/src/generated/ethflow/index.ts
@@ -0,0 +1,6 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+export type { CoWSwapEthFlow } from './CoWSwapEthFlow'
+export * as factories from './factories'
+export { CoWSwapEthFlow__factory } from './factories/CoWSwapEthFlow__factory'
diff --git a/src/libs/abis/src/generated/legacy/ArgentWalletContract.ts b/src/libs/abis/src/generated/legacy/ArgentWalletContract.ts
new file mode 100644
index 0000000000..1b3fedb2f0
--- /dev/null
+++ b/src/libs/abis/src/generated/legacy/ArgentWalletContract.ts
@@ -0,0 +1,155 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+import type {
+  BaseContract,
+  BigNumber,
+  BigNumberish,
+  BytesLike,
+  CallOverrides,
+  ContractTransaction,
+  Overrides,
+  PopulatedTransaction,
+  Signer,
+  utils,
+} from 'ethers'
+import type { FunctionFragment, Result } from '@ethersproject/abi'
+import type { Listener, Provider } from '@ethersproject/providers'
+import type { TypedEventFilter, TypedEvent, TypedListener, OnEvent, PromiseOrValue } from './common'
+
+export interface ArgentWalletContractInterface extends utils.Interface {
+  functions: {
+    'wc_multiCall((address,uint256,bytes)[])': FunctionFragment
+    'isValidSignature(bytes32,bytes)': FunctionFragment
+  }
+
+  getFunction(nameOrSignatureOrTopic: 'wc_multiCall' | 'isValidSignature'): FunctionFragment
+
+  encodeFunctionData(
+    functionFragment: 'wc_multiCall',
+    values: [
+      {
+        to: PromiseOrValue<string>
+        value: PromiseOrValue<BigNumberish>
+        data: PromiseOrValue<BytesLike>
+      }[]
+    ]
+  ): string
+  encodeFunctionData(
+    functionFragment: 'isValidSignature',
+    values: [PromiseOrValue<BytesLike>, PromiseOrValue<BytesLike>]
+  ): string
+
+  decodeFunctionResult(functionFragment: 'wc_multiCall', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'isValidSignature', data: BytesLike): Result
+
+  events: {}
+}
+
+export interface ArgentWalletContract extends BaseContract {
+  connect(signerOrProvider: Signer | Provider | string): this
+  attach(addressOrName: string): this
+  deployed(): Promise<this>
+
+  interface: ArgentWalletContractInterface
+
+  queryFilter<TEvent extends TypedEvent>(
+    event: TypedEventFilter<TEvent>,
+    fromBlockOrBlockhash?: string | number | undefined,
+    toBlock?: string | number | undefined
+  ): Promise<Array<TEvent>>
+
+  listeners<TEvent extends TypedEvent>(eventFilter?: TypedEventFilter<TEvent>): Array<TypedListener<TEvent>>
+  listeners(eventName?: string): Array<Listener>
+  removeAllListeners<TEvent extends TypedEvent>(eventFilter: TypedEventFilter<TEvent>): this
+  removeAllListeners(eventName?: string): this
+  off: OnEvent<this>
+  on: OnEvent<this>
+  once: OnEvent<this>
+  removeListener: OnEvent<this>
+
+  functions: {
+    wc_multiCall(
+      _transactions: {
+        to: PromiseOrValue<string>
+        value: PromiseOrValue<BigNumberish>
+        data: PromiseOrValue<BytesLike>
+      }[],
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<ContractTransaction>
+
+    isValidSignature(
+      _msgHash: PromiseOrValue<BytesLike>,
+      _signature: PromiseOrValue<BytesLike>,
+      overrides?: CallOverrides
+    ): Promise<[string]>
+  }
+
+  wc_multiCall(
+    _transactions: {
+      to: PromiseOrValue<string>
+      value: PromiseOrValue<BigNumberish>
+      data: PromiseOrValue<BytesLike>
+    }[],
+    overrides?: Overrides & { from?: PromiseOrValue<string> }
+  ): Promise<ContractTransaction>
+
+  isValidSignature(
+    _msgHash: PromiseOrValue<BytesLike>,
+    _signature: PromiseOrValue<BytesLike>,
+    overrides?: CallOverrides
+  ): Promise<string>
+
+  callStatic: {
+    wc_multiCall(
+      _transactions: {
+        to: PromiseOrValue<string>
+        value: PromiseOrValue<BigNumberish>
+        data: PromiseOrValue<BytesLike>
+      }[],
+      overrides?: CallOverrides
+    ): Promise<string[]>
+
+    isValidSignature(
+      _msgHash: PromiseOrValue<BytesLike>,
+      _signature: PromiseOrValue<BytesLike>,
+      overrides?: CallOverrides
+    ): Promise<string>
+  }
+
+  filters: {}
+
+  estimateGas: {
+    wc_multiCall(
+      _transactions: {
+        to: PromiseOrValue<string>
+        value: PromiseOrValue<BigNumberish>
+        data: PromiseOrValue<BytesLike>
+      }[],
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<BigNumber>
+
+    isValidSignature(
+      _msgHash: PromiseOrValue<BytesLike>,
+      _signature: PromiseOrValue<BytesLike>,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>
+  }
+
+  populateTransaction: {
+    wc_multiCall(
+      _transactions: {
+        to: PromiseOrValue<string>
+        value: PromiseOrValue<BigNumberish>
+        data: PromiseOrValue<BytesLike>
+      }[],
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<PopulatedTransaction>
+
+    isValidSignature(
+      _msgHash: PromiseOrValue<BytesLike>,
+      _signature: PromiseOrValue<BytesLike>,
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>
+  }
+}
diff --git a/src/libs/abis/src/generated/legacy/ArgentWalletDetector.ts b/src/libs/abis/src/generated/legacy/ArgentWalletDetector.ts
new file mode 100644
index 0000000000..cd2b981a0f
--- /dev/null
+++ b/src/libs/abis/src/generated/legacy/ArgentWalletDetector.ts
@@ -0,0 +1,307 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+import type {
+  BaseContract,
+  BigNumber,
+  BytesLike,
+  CallOverrides,
+  ContractTransaction,
+  Overrides,
+  PopulatedTransaction,
+  Signer,
+  utils,
+} from 'ethers'
+import type { FunctionFragment, Result, EventFragment } from '@ethersproject/abi'
+import type { Listener, Provider } from '@ethersproject/providers'
+import type { TypedEventFilter, TypedEvent, TypedListener, OnEvent, PromiseOrValue } from './common'
+
+export interface ArgentWalletDetectorInterface extends utils.Interface {
+  functions: {
+    'acceptedCodes(bytes32)': FunctionFragment
+    'acceptedImplementations(address)': FunctionFragment
+    'addCode(bytes32)': FunctionFragment
+    'addCodeAndImplementationFromWallet(address)': FunctionFragment
+    'addImplementation(address)': FunctionFragment
+    'changeOwner(address)': FunctionFragment
+    'getCodes()': FunctionFragment
+    'getImplementations()': FunctionFragment
+    'isArgentWallet(address)': FunctionFragment
+    'owner()': FunctionFragment
+  }
+
+  getFunction(
+    nameOrSignatureOrTopic:
+      | 'acceptedCodes'
+      | 'acceptedImplementations'
+      | 'addCode'
+      | 'addCodeAndImplementationFromWallet'
+      | 'addImplementation'
+      | 'changeOwner'
+      | 'getCodes'
+      | 'getImplementations'
+      | 'isArgentWallet'
+      | 'owner'
+  ): FunctionFragment
+
+  encodeFunctionData(functionFragment: 'acceptedCodes', values: [PromiseOrValue<BytesLike>]): string
+  encodeFunctionData(functionFragment: 'acceptedImplementations', values: [PromiseOrValue<string>]): string
+  encodeFunctionData(functionFragment: 'addCode', values: [PromiseOrValue<BytesLike>]): string
+  encodeFunctionData(functionFragment: 'addCodeAndImplementationFromWallet', values: [PromiseOrValue<string>]): string
+  encodeFunctionData(functionFragment: 'addImplementation', values: [PromiseOrValue<string>]): string
+  encodeFunctionData(functionFragment: 'changeOwner', values: [PromiseOrValue<string>]): string
+  encodeFunctionData(functionFragment: 'getCodes', values?: undefined): string
+  encodeFunctionData(functionFragment: 'getImplementations', values?: undefined): string
+  encodeFunctionData(functionFragment: 'isArgentWallet', values: [PromiseOrValue<string>]): string
+  encodeFunctionData(functionFragment: 'owner', values?: undefined): string
+
+  decodeFunctionResult(functionFragment: 'acceptedCodes', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'acceptedImplementations', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'addCode', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'addCodeAndImplementationFromWallet', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'addImplementation', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'changeOwner', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'getCodes', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'getImplementations', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'isArgentWallet', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'owner', data: BytesLike): Result
+
+  events: {
+    'CodeAdded(bytes32)': EventFragment
+    'ImplementationAdded(address)': EventFragment
+    'OwnerChanged(address)': EventFragment
+  }
+
+  getEvent(nameOrSignatureOrTopic: 'CodeAdded'): EventFragment
+  getEvent(nameOrSignatureOrTopic: 'ImplementationAdded'): EventFragment
+  getEvent(nameOrSignatureOrTopic: 'OwnerChanged'): EventFragment
+}
+
+export interface CodeAddedEventObject {
+  code: string
+}
+export type CodeAddedEvent = TypedEvent<[string], CodeAddedEventObject>
+
+export type CodeAddedEventFilter = TypedEventFilter<CodeAddedEvent>
+
+export interface ImplementationAddedEventObject {
+  implementation: string
+}
+export type ImplementationAddedEvent = TypedEvent<[string], ImplementationAddedEventObject>
+
+export type ImplementationAddedEventFilter = TypedEventFilter<ImplementationAddedEvent>
+
+export interface OwnerChangedEventObject {
+  _newOwner: string
+}
+export type OwnerChangedEvent = TypedEvent<[string], OwnerChangedEventObject>
+
+export type OwnerChangedEventFilter = TypedEventFilter<OwnerChangedEvent>
+
+export interface ArgentWalletDetector extends BaseContract {
+  connect(signerOrProvider: Signer | Provider | string): this
+  attach(addressOrName: string): this
+  deployed(): Promise<this>
+
+  interface: ArgentWalletDetectorInterface
+
+  queryFilter<TEvent extends TypedEvent>(
+    event: TypedEventFilter<TEvent>,
+    fromBlockOrBlockhash?: string | number | undefined,
+    toBlock?: string | number | undefined
+  ): Promise<Array<TEvent>>
+
+  listeners<TEvent extends TypedEvent>(eventFilter?: TypedEventFilter<TEvent>): Array<TypedListener<TEvent>>
+  listeners(eventName?: string): Array<Listener>
+  removeAllListeners<TEvent extends TypedEvent>(eventFilter: TypedEventFilter<TEvent>): this
+  removeAllListeners(eventName?: string): this
+  off: OnEvent<this>
+  on: OnEvent<this>
+  once: OnEvent<this>
+  removeListener: OnEvent<this>
+
+  functions: {
+    acceptedCodes(
+      arg0: PromiseOrValue<BytesLike>,
+      overrides?: CallOverrides
+    ): Promise<[boolean, BigNumber] & { exists: boolean; index: BigNumber }>
+
+    acceptedImplementations(
+      arg0: PromiseOrValue<string>,
+      overrides?: CallOverrides
+    ): Promise<[boolean, BigNumber] & { exists: boolean; index: BigNumber }>
+
+    addCode(
+      _code: PromiseOrValue<BytesLike>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<ContractTransaction>
+
+    addCodeAndImplementationFromWallet(
+      _argentWallet: PromiseOrValue<string>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<ContractTransaction>
+
+    addImplementation(
+      _impl: PromiseOrValue<string>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<ContractTransaction>
+
+    changeOwner(
+      _newOwner: PromiseOrValue<string>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<ContractTransaction>
+
+    getCodes(overrides?: CallOverrides): Promise<[string[]]>
+
+    getImplementations(overrides?: CallOverrides): Promise<[string[]]>
+
+    isArgentWallet(_wallet: PromiseOrValue<string>, overrides?: CallOverrides): Promise<[boolean]>
+
+    owner(overrides?: CallOverrides): Promise<[string]>
+  }
+
+  acceptedCodes(
+    arg0: PromiseOrValue<BytesLike>,
+    overrides?: CallOverrides
+  ): Promise<[boolean, BigNumber] & { exists: boolean; index: BigNumber }>
+
+  acceptedImplementations(
+    arg0: PromiseOrValue<string>,
+    overrides?: CallOverrides
+  ): Promise<[boolean, BigNumber] & { exists: boolean; index: BigNumber }>
+
+  addCode(
+    _code: PromiseOrValue<BytesLike>,
+    overrides?: Overrides & { from?: PromiseOrValue<string> }
+  ): Promise<ContractTransaction>
+
+  addCodeAndImplementationFromWallet(
+    _argentWallet: PromiseOrValue<string>,
+    overrides?: Overrides & { from?: PromiseOrValue<string> }
+  ): Promise<ContractTransaction>
+
+  addImplementation(
+    _impl: PromiseOrValue<string>,
+    overrides?: Overrides & { from?: PromiseOrValue<string> }
+  ): Promise<ContractTransaction>
+
+  changeOwner(
+    _newOwner: PromiseOrValue<string>,
+    overrides?: Overrides & { from?: PromiseOrValue<string> }
+  ): Promise<ContractTransaction>
+
+  getCodes(overrides?: CallOverrides): Promise<string[]>
+
+  getImplementations(overrides?: CallOverrides): Promise<string[]>
+
+  isArgentWallet(_wallet: PromiseOrValue<string>, overrides?: CallOverrides): Promise<boolean>
+
+  owner(overrides?: CallOverrides): Promise<string>
+
+  callStatic: {
+    acceptedCodes(
+      arg0: PromiseOrValue<BytesLike>,
+      overrides?: CallOverrides
+    ): Promise<[boolean, BigNumber] & { exists: boolean; index: BigNumber }>
+
+    acceptedImplementations(
+      arg0: PromiseOrValue<string>,
+      overrides?: CallOverrides
+    ): Promise<[boolean, BigNumber] & { exists: boolean; index: BigNumber }>
+
+    addCode(_code: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<void>
+
+    addCodeAndImplementationFromWallet(_argentWallet: PromiseOrValue<string>, overrides?: CallOverrides): Promise<void>
+
+    addImplementation(_impl: PromiseOrValue<string>, overrides?: CallOverrides): Promise<void>
+
+    changeOwner(_newOwner: PromiseOrValue<string>, overrides?: CallOverrides): Promise<void>
+
+    getCodes(overrides?: CallOverrides): Promise<string[]>
+
+    getImplementations(overrides?: CallOverrides): Promise<string[]>
+
+    isArgentWallet(_wallet: PromiseOrValue<string>, overrides?: CallOverrides): Promise<boolean>
+
+    owner(overrides?: CallOverrides): Promise<string>
+  }
+
+  filters: {
+    'CodeAdded(bytes32)'(code?: PromiseOrValue<BytesLike> | null): CodeAddedEventFilter
+    CodeAdded(code?: PromiseOrValue<BytesLike> | null): CodeAddedEventFilter
+
+    'ImplementationAdded(address)'(implementation?: PromiseOrValue<string> | null): ImplementationAddedEventFilter
+    ImplementationAdded(implementation?: PromiseOrValue<string> | null): ImplementationAddedEventFilter
+
+    'OwnerChanged(address)'(_newOwner?: PromiseOrValue<string> | null): OwnerChangedEventFilter
+    OwnerChanged(_newOwner?: PromiseOrValue<string> | null): OwnerChangedEventFilter
+  }
+
+  estimateGas: {
+    acceptedCodes(arg0: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<BigNumber>
+
+    acceptedImplementations(arg0: PromiseOrValue<string>, overrides?: CallOverrides): Promise<BigNumber>
+
+    addCode(
+      _code: PromiseOrValue<BytesLike>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<BigNumber>
+
+    addCodeAndImplementationFromWallet(
+      _argentWallet: PromiseOrValue<string>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<BigNumber>
+
+    addImplementation(
+      _impl: PromiseOrValue<string>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<BigNumber>
+
+    changeOwner(
+      _newOwner: PromiseOrValue<string>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<BigNumber>
+
+    getCodes(overrides?: CallOverrides): Promise<BigNumber>
+
+    getImplementations(overrides?: CallOverrides): Promise<BigNumber>
+
+    isArgentWallet(_wallet: PromiseOrValue<string>, overrides?: CallOverrides): Promise<BigNumber>
+
+    owner(overrides?: CallOverrides): Promise<BigNumber>
+  }
+
+  populateTransaction: {
+    acceptedCodes(arg0: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<PopulatedTransaction>
+
+    acceptedImplementations(arg0: PromiseOrValue<string>, overrides?: CallOverrides): Promise<PopulatedTransaction>
+
+    addCode(
+      _code: PromiseOrValue<BytesLike>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<PopulatedTransaction>
+
+    addCodeAndImplementationFromWallet(
+      _argentWallet: PromiseOrValue<string>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<PopulatedTransaction>
+
+    addImplementation(
+      _impl: PromiseOrValue<string>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<PopulatedTransaction>
+
+    changeOwner(
+      _newOwner: PromiseOrValue<string>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<PopulatedTransaction>
+
+    getCodes(overrides?: CallOverrides): Promise<PopulatedTransaction>
+
+    getImplementations(overrides?: CallOverrides): Promise<PopulatedTransaction>
+
+    isArgentWallet(_wallet: PromiseOrValue<string>, overrides?: CallOverrides): Promise<PopulatedTransaction>
+
+    owner(overrides?: CallOverrides): Promise<PopulatedTransaction>
+  }
+}
diff --git a/src/libs/abis/src/generated/legacy/Eip_2612.ts b/src/libs/abis/src/generated/legacy/Eip_2612.ts
new file mode 100644
index 0000000000..6e17673eda
--- /dev/null
+++ b/src/libs/abis/src/generated/legacy/Eip_2612.ts
@@ -0,0 +1,77 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+import type { BaseContract, BigNumber, BytesLike, CallOverrides, PopulatedTransaction, Signer, utils } from 'ethers'
+import type { FunctionFragment, Result } from '@ethersproject/abi'
+import type { Listener, Provider } from '@ethersproject/providers'
+import type { TypedEventFilter, TypedEvent, TypedListener, OnEvent, PromiseOrValue } from './common'
+
+export interface Eip_2612Interface extends utils.Interface {
+  functions: {
+    'nonces(address)': FunctionFragment
+    'DOMAIN_SEPARATOR()': FunctionFragment
+  }
+
+  getFunction(nameOrSignatureOrTopic: 'nonces' | 'DOMAIN_SEPARATOR'): FunctionFragment
+
+  encodeFunctionData(functionFragment: 'nonces', values: [PromiseOrValue<string>]): string
+  encodeFunctionData(functionFragment: 'DOMAIN_SEPARATOR', values?: undefined): string
+
+  decodeFunctionResult(functionFragment: 'nonces', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'DOMAIN_SEPARATOR', data: BytesLike): Result
+
+  events: {}
+}
+
+export interface Eip_2612 extends BaseContract {
+  connect(signerOrProvider: Signer | Provider | string): this
+  attach(addressOrName: string): this
+  deployed(): Promise<this>
+
+  interface: Eip_2612Interface
+
+  queryFilter<TEvent extends TypedEvent>(
+    event: TypedEventFilter<TEvent>,
+    fromBlockOrBlockhash?: string | number | undefined,
+    toBlock?: string | number | undefined
+  ): Promise<Array<TEvent>>
+
+  listeners<TEvent extends TypedEvent>(eventFilter?: TypedEventFilter<TEvent>): Array<TypedListener<TEvent>>
+  listeners(eventName?: string): Array<Listener>
+  removeAllListeners<TEvent extends TypedEvent>(eventFilter: TypedEventFilter<TEvent>): this
+  removeAllListeners(eventName?: string): this
+  off: OnEvent<this>
+  on: OnEvent<this>
+  once: OnEvent<this>
+  removeListener: OnEvent<this>
+
+  functions: {
+    nonces(owner: PromiseOrValue<string>, overrides?: CallOverrides): Promise<[BigNumber]>
+
+    DOMAIN_SEPARATOR(overrides?: CallOverrides): Promise<[string]>
+  }
+
+  nonces(owner: PromiseOrValue<string>, overrides?: CallOverrides): Promise<BigNumber>
+
+  DOMAIN_SEPARATOR(overrides?: CallOverrides): Promise<string>
+
+  callStatic: {
+    nonces(owner: PromiseOrValue<string>, overrides?: CallOverrides): Promise<BigNumber>
+
+    DOMAIN_SEPARATOR(overrides?: CallOverrides): Promise<string>
+  }
+
+  filters: {}
+
+  estimateGas: {
+    nonces(owner: PromiseOrValue<string>, overrides?: CallOverrides): Promise<BigNumber>
+
+    DOMAIN_SEPARATOR(overrides?: CallOverrides): Promise<BigNumber>
+  }
+
+  populateTransaction: {
+    nonces(owner: PromiseOrValue<string>, overrides?: CallOverrides): Promise<PopulatedTransaction>
+
+    DOMAIN_SEPARATOR(overrides?: CallOverrides): Promise<PopulatedTransaction>
+  }
+}
diff --git a/src/libs/abis/src/generated/legacy/EnsPublicResolver.ts b/src/libs/abis/src/generated/legacy/EnsPublicResolver.ts
new file mode 100644
index 0000000000..dcc3054ad5
--- /dev/null
+++ b/src/libs/abis/src/generated/legacy/EnsPublicResolver.ts
@@ -0,0 +1,999 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+import type {
+  BaseContract,
+  BigNumber,
+  BigNumberish,
+  BytesLike,
+  CallOverrides,
+  ContractTransaction,
+  Overrides,
+  PopulatedTransaction,
+  Signer,
+  utils,
+} from 'ethers'
+import type { FunctionFragment, Result, EventFragment } from '@ethersproject/abi'
+import type { Listener, Provider } from '@ethersproject/providers'
+import type { TypedEventFilter, TypedEvent, TypedListener, OnEvent, PromiseOrValue } from './common'
+
+export interface EnsPublicResolverInterface extends utils.Interface {
+  functions: {
+    'ABI(bytes32,uint256)': FunctionFragment
+    'addr(bytes32)': FunctionFragment
+    'authorisations(bytes32,address,address)': FunctionFragment
+    'clearDNSZone(bytes32)': FunctionFragment
+    'contenthash(bytes32)': FunctionFragment
+    'dnsRecord(bytes32,bytes32,uint16)': FunctionFragment
+    'hasDNSRecords(bytes32,bytes32)': FunctionFragment
+    'interfaceImplementer(bytes32,bytes4)': FunctionFragment
+    'name(bytes32)': FunctionFragment
+    'pubkey(bytes32)': FunctionFragment
+    'setABI(bytes32,uint256,bytes)': FunctionFragment
+    'setAddr(bytes32,uint256,bytes)': FunctionFragment
+    'setAddr(bytes32,address)': FunctionFragment
+    'setAuthorisation(bytes32,address,bool)': FunctionFragment
+    'setContenthash(bytes32,bytes)': FunctionFragment
+    'setDNSRecords(bytes32,bytes)': FunctionFragment
+    'setInterface(bytes32,bytes4,address)': FunctionFragment
+    'setName(bytes32,string)': FunctionFragment
+    'setPubkey(bytes32,bytes32,bytes32)': FunctionFragment
+    'setText(bytes32,string,string)': FunctionFragment
+    'supportsInterface(bytes4)': FunctionFragment
+    'text(bytes32,string)': FunctionFragment
+  }
+
+  getFunction(
+    nameOrSignatureOrTopic:
+      | 'ABI'
+      | 'addr'
+      | 'authorisations'
+      | 'clearDNSZone'
+      | 'contenthash'
+      | 'dnsRecord'
+      | 'hasDNSRecords'
+      | 'interfaceImplementer'
+      | 'name'
+      | 'pubkey'
+      | 'setABI'
+      | 'setAddr(bytes32,uint256,bytes)'
+      | 'setAddr(bytes32,address)'
+      | 'setAuthorisation'
+      | 'setContenthash'
+      | 'setDNSRecords'
+      | 'setInterface'
+      | 'setName'
+      | 'setPubkey'
+      | 'setText'
+      | 'supportsInterface'
+      | 'text'
+  ): FunctionFragment
+
+  encodeFunctionData(functionFragment: 'ABI', values: [PromiseOrValue<BytesLike>, PromiseOrValue<BigNumberish>]): string
+  encodeFunctionData(functionFragment: 'addr', values: [PromiseOrValue<BytesLike>]): string
+  encodeFunctionData(
+    functionFragment: 'authorisations',
+    values: [PromiseOrValue<BytesLike>, PromiseOrValue<string>, PromiseOrValue<string>]
+  ): string
+  encodeFunctionData(functionFragment: 'clearDNSZone', values: [PromiseOrValue<BytesLike>]): string
+  encodeFunctionData(functionFragment: 'contenthash', values: [PromiseOrValue<BytesLike>]): string
+  encodeFunctionData(
+    functionFragment: 'dnsRecord',
+    values: [PromiseOrValue<BytesLike>, PromiseOrValue<BytesLike>, PromiseOrValue<BigNumberish>]
+  ): string
+  encodeFunctionData(
+    functionFragment: 'hasDNSRecords',
+    values: [PromiseOrValue<BytesLike>, PromiseOrValue<BytesLike>]
+  ): string
+  encodeFunctionData(
+    functionFragment: 'interfaceImplementer',
+    values: [PromiseOrValue<BytesLike>, PromiseOrValue<BytesLike>]
+  ): string
+  encodeFunctionData(functionFragment: 'name', values: [PromiseOrValue<BytesLike>]): string
+  encodeFunctionData(functionFragment: 'pubkey', values: [PromiseOrValue<BytesLike>]): string
+  encodeFunctionData(
+    functionFragment: 'setABI',
+    values: [PromiseOrValue<BytesLike>, PromiseOrValue<BigNumberish>, PromiseOrValue<BytesLike>]
+  ): string
+  encodeFunctionData(
+    functionFragment: 'setAddr(bytes32,uint256,bytes)',
+    values: [PromiseOrValue<BytesLike>, PromiseOrValue<BigNumberish>, PromiseOrValue<BytesLike>]
+  ): string
+  encodeFunctionData(
+    functionFragment: 'setAddr(bytes32,address)',
+    values: [PromiseOrValue<BytesLike>, PromiseOrValue<string>]
+  ): string
+  encodeFunctionData(
+    functionFragment: 'setAuthorisation',
+    values: [PromiseOrValue<BytesLike>, PromiseOrValue<string>, PromiseOrValue<boolean>]
+  ): string
+  encodeFunctionData(
+    functionFragment: 'setContenthash',
+    values: [PromiseOrValue<BytesLike>, PromiseOrValue<BytesLike>]
+  ): string
+  encodeFunctionData(
+    functionFragment: 'setDNSRecords',
+    values: [PromiseOrValue<BytesLike>, PromiseOrValue<BytesLike>]
+  ): string
+  encodeFunctionData(
+    functionFragment: 'setInterface',
+    values: [PromiseOrValue<BytesLike>, PromiseOrValue<BytesLike>, PromiseOrValue<string>]
+  ): string
+  encodeFunctionData(functionFragment: 'setName', values: [PromiseOrValue<BytesLike>, PromiseOrValue<string>]): string
+  encodeFunctionData(
+    functionFragment: 'setPubkey',
+    values: [PromiseOrValue<BytesLike>, PromiseOrValue<BytesLike>, PromiseOrValue<BytesLike>]
+  ): string
+  encodeFunctionData(
+    functionFragment: 'setText',
+    values: [PromiseOrValue<BytesLike>, PromiseOrValue<string>, PromiseOrValue<string>]
+  ): string
+  encodeFunctionData(functionFragment: 'supportsInterface', values: [PromiseOrValue<BytesLike>]): string
+  encodeFunctionData(functionFragment: 'text', values: [PromiseOrValue<BytesLike>, PromiseOrValue<string>]): string
+
+  decodeFunctionResult(functionFragment: 'ABI', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'addr', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'authorisations', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'clearDNSZone', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'contenthash', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'dnsRecord', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'hasDNSRecords', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'interfaceImplementer', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'name', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'pubkey', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'setABI', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'setAddr(bytes32,uint256,bytes)', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'setAddr(bytes32,address)', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'setAuthorisation', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'setContenthash', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'setDNSRecords', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'setInterface', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'setName', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'setPubkey', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'setText', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'supportsInterface', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'text', data: BytesLike): Result
+
+  events: {
+    'ABIChanged(bytes32,uint256)': EventFragment
+    'AddrChanged(bytes32,address)': EventFragment
+    'AddressChanged(bytes32,uint256,bytes)': EventFragment
+    'AuthorisationChanged(bytes32,address,address,bool)': EventFragment
+    'ContenthashChanged(bytes32,bytes)': EventFragment
+    'DNSRecordChanged(bytes32,bytes,uint16,bytes)': EventFragment
+    'DNSRecordDeleted(bytes32,bytes,uint16)': EventFragment
+    'DNSZoneCleared(bytes32)': EventFragment
+    'InterfaceChanged(bytes32,bytes4,address)': EventFragment
+    'NameChanged(bytes32,string)': EventFragment
+    'PubkeyChanged(bytes32,bytes32,bytes32)': EventFragment
+    'TextChanged(bytes32,string,string)': EventFragment
+  }
+
+  getEvent(nameOrSignatureOrTopic: 'ABIChanged'): EventFragment
+  getEvent(nameOrSignatureOrTopic: 'AddrChanged'): EventFragment
+  getEvent(nameOrSignatureOrTopic: 'AddressChanged'): EventFragment
+  getEvent(nameOrSignatureOrTopic: 'AuthorisationChanged'): EventFragment
+  getEvent(nameOrSignatureOrTopic: 'ContenthashChanged'): EventFragment
+  getEvent(nameOrSignatureOrTopic: 'DNSRecordChanged'): EventFragment
+  getEvent(nameOrSignatureOrTopic: 'DNSRecordDeleted'): EventFragment
+  getEvent(nameOrSignatureOrTopic: 'DNSZoneCleared'): EventFragment
+  getEvent(nameOrSignatureOrTopic: 'InterfaceChanged'): EventFragment
+  getEvent(nameOrSignatureOrTopic: 'NameChanged'): EventFragment
+  getEvent(nameOrSignatureOrTopic: 'PubkeyChanged'): EventFragment
+  getEvent(nameOrSignatureOrTopic: 'TextChanged'): EventFragment
+}
+
+export interface ABIChangedEventObject {
+  node: string
+  contentType: BigNumber
+}
+export type ABIChangedEvent = TypedEvent<[string, BigNumber], ABIChangedEventObject>
+
+export type ABIChangedEventFilter = TypedEventFilter<ABIChangedEvent>
+
+export interface AddrChangedEventObject {
+  node: string
+  a: string
+}
+export type AddrChangedEvent = TypedEvent<[string, string], AddrChangedEventObject>
+
+export type AddrChangedEventFilter = TypedEventFilter<AddrChangedEvent>
+
+export interface AddressChangedEventObject {
+  node: string
+  coinType: BigNumber
+  newAddress: string
+}
+export type AddressChangedEvent = TypedEvent<[string, BigNumber, string], AddressChangedEventObject>
+
+export type AddressChangedEventFilter = TypedEventFilter<AddressChangedEvent>
+
+export interface AuthorisationChangedEventObject {
+  node: string
+  owner: string
+  target: string
+  isAuthorised: boolean
+}
+export type AuthorisationChangedEvent = TypedEvent<[string, string, string, boolean], AuthorisationChangedEventObject>
+
+export type AuthorisationChangedEventFilter = TypedEventFilter<AuthorisationChangedEvent>
+
+export interface ContenthashChangedEventObject {
+  node: string
+  hash: string
+}
+export type ContenthashChangedEvent = TypedEvent<[string, string], ContenthashChangedEventObject>
+
+export type ContenthashChangedEventFilter = TypedEventFilter<ContenthashChangedEvent>
+
+export interface DNSRecordChangedEventObject {
+  node: string
+  name: string
+  resource: number
+  record: string
+}
+export type DNSRecordChangedEvent = TypedEvent<[string, string, number, string], DNSRecordChangedEventObject>
+
+export type DNSRecordChangedEventFilter = TypedEventFilter<DNSRecordChangedEvent>
+
+export interface DNSRecordDeletedEventObject {
+  node: string
+  name: string
+  resource: number
+}
+export type DNSRecordDeletedEvent = TypedEvent<[string, string, number], DNSRecordDeletedEventObject>
+
+export type DNSRecordDeletedEventFilter = TypedEventFilter<DNSRecordDeletedEvent>
+
+export interface DNSZoneClearedEventObject {
+  node: string
+}
+export type DNSZoneClearedEvent = TypedEvent<[string], DNSZoneClearedEventObject>
+
+export type DNSZoneClearedEventFilter = TypedEventFilter<DNSZoneClearedEvent>
+
+export interface InterfaceChangedEventObject {
+  node: string
+  interfaceID: string
+  implementer: string
+}
+export type InterfaceChangedEvent = TypedEvent<[string, string, string], InterfaceChangedEventObject>
+
+export type InterfaceChangedEventFilter = TypedEventFilter<InterfaceChangedEvent>
+
+export interface NameChangedEventObject {
+  node: string
+  name: string
+}
+export type NameChangedEvent = TypedEvent<[string, string], NameChangedEventObject>
+
+export type NameChangedEventFilter = TypedEventFilter<NameChangedEvent>
+
+export interface PubkeyChangedEventObject {
+  node: string
+  x: string
+  y: string
+}
+export type PubkeyChangedEvent = TypedEvent<[string, string, string], PubkeyChangedEventObject>
+
+export type PubkeyChangedEventFilter = TypedEventFilter<PubkeyChangedEvent>
+
+export interface TextChangedEventObject {
+  node: string
+  indexedKey: string
+  key: string
+}
+export type TextChangedEvent = TypedEvent<[string, string, string], TextChangedEventObject>
+
+export type TextChangedEventFilter = TypedEventFilter<TextChangedEvent>
+
+export interface EnsPublicResolver extends BaseContract {
+  connect(signerOrProvider: Signer | Provider | string): this
+  attach(addressOrName: string): this
+  deployed(): Promise<this>
+
+  interface: EnsPublicResolverInterface
+
+  queryFilter<TEvent extends TypedEvent>(
+    event: TypedEventFilter<TEvent>,
+    fromBlockOrBlockhash?: string | number | undefined,
+    toBlock?: string | number | undefined
+  ): Promise<Array<TEvent>>
+
+  listeners<TEvent extends TypedEvent>(eventFilter?: TypedEventFilter<TEvent>): Array<TypedListener<TEvent>>
+  listeners(eventName?: string): Array<Listener>
+  removeAllListeners<TEvent extends TypedEvent>(eventFilter: TypedEventFilter<TEvent>): this
+  removeAllListeners(eventName?: string): this
+  off: OnEvent<this>
+  on: OnEvent<this>
+  once: OnEvent<this>
+  removeListener: OnEvent<this>
+
+  functions: {
+    ABI(
+      node: PromiseOrValue<BytesLike>,
+      contentTypes: PromiseOrValue<BigNumberish>,
+      overrides?: CallOverrides
+    ): Promise<[BigNumber, string]>
+
+    addr(node: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<[string]>
+
+    authorisations(
+      arg0: PromiseOrValue<BytesLike>,
+      arg1: PromiseOrValue<string>,
+      arg2: PromiseOrValue<string>,
+      overrides?: CallOverrides
+    ): Promise<[boolean]>
+
+    clearDNSZone(
+      node: PromiseOrValue<BytesLike>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<ContractTransaction>
+
+    contenthash(node: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<[string]>
+
+    dnsRecord(
+      node: PromiseOrValue<BytesLike>,
+      name: PromiseOrValue<BytesLike>,
+      resource: PromiseOrValue<BigNumberish>,
+      overrides?: CallOverrides
+    ): Promise<[string]>
+
+    hasDNSRecords(
+      node: PromiseOrValue<BytesLike>,
+      name: PromiseOrValue<BytesLike>,
+      overrides?: CallOverrides
+    ): Promise<[boolean]>
+
+    interfaceImplementer(
+      node: PromiseOrValue<BytesLike>,
+      interfaceID: PromiseOrValue<BytesLike>,
+      overrides?: CallOverrides
+    ): Promise<[string]>
+
+    name(node: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<[string]>
+
+    pubkey(
+      node: PromiseOrValue<BytesLike>,
+      overrides?: CallOverrides
+    ): Promise<[string, string] & { x: string; y: string }>
+
+    setABI(
+      node: PromiseOrValue<BytesLike>,
+      contentType: PromiseOrValue<BigNumberish>,
+      data: PromiseOrValue<BytesLike>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<ContractTransaction>
+
+    'setAddr(bytes32,uint256,bytes)'(
+      node: PromiseOrValue<BytesLike>,
+      coinType: PromiseOrValue<BigNumberish>,
+      a: PromiseOrValue<BytesLike>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<ContractTransaction>
+
+    'setAddr(bytes32,address)'(
+      node: PromiseOrValue<BytesLike>,
+      a: PromiseOrValue<string>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<ContractTransaction>
+
+    setAuthorisation(
+      node: PromiseOrValue<BytesLike>,
+      target: PromiseOrValue<string>,
+      isAuthorised: PromiseOrValue<boolean>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<ContractTransaction>
+
+    setContenthash(
+      node: PromiseOrValue<BytesLike>,
+      hash: PromiseOrValue<BytesLike>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<ContractTransaction>
+
+    setDNSRecords(
+      node: PromiseOrValue<BytesLike>,
+      data: PromiseOrValue<BytesLike>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<ContractTransaction>
+
+    setInterface(
+      node: PromiseOrValue<BytesLike>,
+      interfaceID: PromiseOrValue<BytesLike>,
+      implementer: PromiseOrValue<string>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<ContractTransaction>
+
+    setName(
+      node: PromiseOrValue<BytesLike>,
+      name: PromiseOrValue<string>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<ContractTransaction>
+
+    setPubkey(
+      node: PromiseOrValue<BytesLike>,
+      x: PromiseOrValue<BytesLike>,
+      y: PromiseOrValue<BytesLike>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<ContractTransaction>
+
+    setText(
+      node: PromiseOrValue<BytesLike>,
+      key: PromiseOrValue<string>,
+      value: PromiseOrValue<string>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<ContractTransaction>
+
+    supportsInterface(interfaceID: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<[boolean]>
+
+    text(node: PromiseOrValue<BytesLike>, key: PromiseOrValue<string>, overrides?: CallOverrides): Promise<[string]>
+  }
+
+  ABI(
+    node: PromiseOrValue<BytesLike>,
+    contentTypes: PromiseOrValue<BigNumberish>,
+    overrides?: CallOverrides
+  ): Promise<[BigNumber, string]>
+
+  addr(node: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<string>
+
+  authorisations(
+    arg0: PromiseOrValue<BytesLike>,
+    arg1: PromiseOrValue<string>,
+    arg2: PromiseOrValue<string>,
+    overrides?: CallOverrides
+  ): Promise<boolean>
+
+  clearDNSZone(
+    node: PromiseOrValue<BytesLike>,
+    overrides?: Overrides & { from?: PromiseOrValue<string> }
+  ): Promise<ContractTransaction>
+
+  contenthash(node: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<string>
+
+  dnsRecord(
+    node: PromiseOrValue<BytesLike>,
+    name: PromiseOrValue<BytesLike>,
+    resource: PromiseOrValue<BigNumberish>,
+    overrides?: CallOverrides
+  ): Promise<string>
+
+  hasDNSRecords(
+    node: PromiseOrValue<BytesLike>,
+    name: PromiseOrValue<BytesLike>,
+    overrides?: CallOverrides
+  ): Promise<boolean>
+
+  interfaceImplementer(
+    node: PromiseOrValue<BytesLike>,
+    interfaceID: PromiseOrValue<BytesLike>,
+    overrides?: CallOverrides
+  ): Promise<string>
+
+  name(node: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<string>
+
+  pubkey(
+    node: PromiseOrValue<BytesLike>,
+    overrides?: CallOverrides
+  ): Promise<[string, string] & { x: string; y: string }>
+
+  setABI(
+    node: PromiseOrValue<BytesLike>,
+    contentType: PromiseOrValue<BigNumberish>,
+    data: PromiseOrValue<BytesLike>,
+    overrides?: Overrides & { from?: PromiseOrValue<string> }
+  ): Promise<ContractTransaction>
+
+  'setAddr(bytes32,uint256,bytes)'(
+    node: PromiseOrValue<BytesLike>,
+    coinType: PromiseOrValue<BigNumberish>,
+    a: PromiseOrValue<BytesLike>,
+    overrides?: Overrides & { from?: PromiseOrValue<string> }
+  ): Promise<ContractTransaction>
+
+  'setAddr(bytes32,address)'(
+    node: PromiseOrValue<BytesLike>,
+    a: PromiseOrValue<string>,
+    overrides?: Overrides & { from?: PromiseOrValue<string> }
+  ): Promise<ContractTransaction>
+
+  setAuthorisation(
+    node: PromiseOrValue<BytesLike>,
+    target: PromiseOrValue<string>,
+    isAuthorised: PromiseOrValue<boolean>,
+    overrides?: Overrides & { from?: PromiseOrValue<string> }
+  ): Promise<ContractTransaction>
+
+  setContenthash(
+    node: PromiseOrValue<BytesLike>,
+    hash: PromiseOrValue<BytesLike>,
+    overrides?: Overrides & { from?: PromiseOrValue<string> }
+  ): Promise<ContractTransaction>
+
+  setDNSRecords(
+    node: PromiseOrValue<BytesLike>,
+    data: PromiseOrValue<BytesLike>,
+    overrides?: Overrides & { from?: PromiseOrValue<string> }
+  ): Promise<ContractTransaction>
+
+  setInterface(
+    node: PromiseOrValue<BytesLike>,
+    interfaceID: PromiseOrValue<BytesLike>,
+    implementer: PromiseOrValue<string>,
+    overrides?: Overrides & { from?: PromiseOrValue<string> }
+  ): Promise<ContractTransaction>
+
+  setName(
+    node: PromiseOrValue<BytesLike>,
+    name: PromiseOrValue<string>,
+    overrides?: Overrides & { from?: PromiseOrValue<string> }
+  ): Promise<ContractTransaction>
+
+  setPubkey(
+    node: PromiseOrValue<BytesLike>,
+    x: PromiseOrValue<BytesLike>,
+    y: PromiseOrValue<BytesLike>,
+    overrides?: Overrides & { from?: PromiseOrValue<string> }
+  ): Promise<ContractTransaction>
+
+  setText(
+    node: PromiseOrValue<BytesLike>,
+    key: PromiseOrValue<string>,
+    value: PromiseOrValue<string>,
+    overrides?: Overrides & { from?: PromiseOrValue<string> }
+  ): Promise<ContractTransaction>
+
+  supportsInterface(interfaceID: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<boolean>
+
+  text(node: PromiseOrValue<BytesLike>, key: PromiseOrValue<string>, overrides?: CallOverrides): Promise<string>
+
+  callStatic: {
+    ABI(
+      node: PromiseOrValue<BytesLike>,
+      contentTypes: PromiseOrValue<BigNumberish>,
+      overrides?: CallOverrides
+    ): Promise<[BigNumber, string]>
+
+    addr(node: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<string>
+
+    authorisations(
+      arg0: PromiseOrValue<BytesLike>,
+      arg1: PromiseOrValue<string>,
+      arg2: PromiseOrValue<string>,
+      overrides?: CallOverrides
+    ): Promise<boolean>
+
+    clearDNSZone(node: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<void>
+
+    contenthash(node: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<string>
+
+    dnsRecord(
+      node: PromiseOrValue<BytesLike>,
+      name: PromiseOrValue<BytesLike>,
+      resource: PromiseOrValue<BigNumberish>,
+      overrides?: CallOverrides
+    ): Promise<string>
+
+    hasDNSRecords(
+      node: PromiseOrValue<BytesLike>,
+      name: PromiseOrValue<BytesLike>,
+      overrides?: CallOverrides
+    ): Promise<boolean>
+
+    interfaceImplementer(
+      node: PromiseOrValue<BytesLike>,
+      interfaceID: PromiseOrValue<BytesLike>,
+      overrides?: CallOverrides
+    ): Promise<string>
+
+    name(node: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<string>
+
+    pubkey(
+      node: PromiseOrValue<BytesLike>,
+      overrides?: CallOverrides
+    ): Promise<[string, string] & { x: string; y: string }>
+
+    setABI(
+      node: PromiseOrValue<BytesLike>,
+      contentType: PromiseOrValue<BigNumberish>,
+      data: PromiseOrValue<BytesLike>,
+      overrides?: CallOverrides
+    ): Promise<void>
+
+    'setAddr(bytes32,uint256,bytes)'(
+      node: PromiseOrValue<BytesLike>,
+      coinType: PromiseOrValue<BigNumberish>,
+      a: PromiseOrValue<BytesLike>,
+      overrides?: CallOverrides
+    ): Promise<void>
+
+    'setAddr(bytes32,address)'(
+      node: PromiseOrValue<BytesLike>,
+      a: PromiseOrValue<string>,
+      overrides?: CallOverrides
+    ): Promise<void>
+
+    setAuthorisation(
+      node: PromiseOrValue<BytesLike>,
+      target: PromiseOrValue<string>,
+      isAuthorised: PromiseOrValue<boolean>,
+      overrides?: CallOverrides
+    ): Promise<void>
+
+    setContenthash(
+      node: PromiseOrValue<BytesLike>,
+      hash: PromiseOrValue<BytesLike>,
+      overrides?: CallOverrides
+    ): Promise<void>
+
+    setDNSRecords(
+      node: PromiseOrValue<BytesLike>,
+      data: PromiseOrValue<BytesLike>,
+      overrides?: CallOverrides
+    ): Promise<void>
+
+    setInterface(
+      node: PromiseOrValue<BytesLike>,
+      interfaceID: PromiseOrValue<BytesLike>,
+      implementer: PromiseOrValue<string>,
+      overrides?: CallOverrides
+    ): Promise<void>
+
+    setName(node: PromiseOrValue<BytesLike>, name: PromiseOrValue<string>, overrides?: CallOverrides): Promise<void>
+
+    setPubkey(
+      node: PromiseOrValue<BytesLike>,
+      x: PromiseOrValue<BytesLike>,
+      y: PromiseOrValue<BytesLike>,
+      overrides?: CallOverrides
+    ): Promise<void>
+
+    setText(
+      node: PromiseOrValue<BytesLike>,
+      key: PromiseOrValue<string>,
+      value: PromiseOrValue<string>,
+      overrides?: CallOverrides
+    ): Promise<void>
+
+    supportsInterface(interfaceID: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<boolean>
+
+    text(node: PromiseOrValue<BytesLike>, key: PromiseOrValue<string>, overrides?: CallOverrides): Promise<string>
+  }
+
+  filters: {
+    'ABIChanged(bytes32,uint256)'(
+      node?: PromiseOrValue<BytesLike> | null,
+      contentType?: PromiseOrValue<BigNumberish> | null
+    ): ABIChangedEventFilter
+    ABIChanged(
+      node?: PromiseOrValue<BytesLike> | null,
+      contentType?: PromiseOrValue<BigNumberish> | null
+    ): ABIChangedEventFilter
+
+    'AddrChanged(bytes32,address)'(node?: PromiseOrValue<BytesLike> | null, a?: null): AddrChangedEventFilter
+    AddrChanged(node?: PromiseOrValue<BytesLike> | null, a?: null): AddrChangedEventFilter
+
+    'AddressChanged(bytes32,uint256,bytes)'(
+      node?: PromiseOrValue<BytesLike> | null,
+      coinType?: null,
+      newAddress?: null
+    ): AddressChangedEventFilter
+    AddressChanged(
+      node?: PromiseOrValue<BytesLike> | null,
+      coinType?: null,
+      newAddress?: null
+    ): AddressChangedEventFilter
+
+    'AuthorisationChanged(bytes32,address,address,bool)'(
+      node?: PromiseOrValue<BytesLike> | null,
+      owner?: PromiseOrValue<string> | null,
+      target?: PromiseOrValue<string> | null,
+      isAuthorised?: null
+    ): AuthorisationChangedEventFilter
+    AuthorisationChanged(
+      node?: PromiseOrValue<BytesLike> | null,
+      owner?: PromiseOrValue<string> | null,
+      target?: PromiseOrValue<string> | null,
+      isAuthorised?: null
+    ): AuthorisationChangedEventFilter
+
+    'ContenthashChanged(bytes32,bytes)'(
+      node?: PromiseOrValue<BytesLike> | null,
+      hash?: null
+    ): ContenthashChangedEventFilter
+    ContenthashChanged(node?: PromiseOrValue<BytesLike> | null, hash?: null): ContenthashChangedEventFilter
+
+    'DNSRecordChanged(bytes32,bytes,uint16,bytes)'(
+      node?: PromiseOrValue<BytesLike> | null,
+      name?: null,
+      resource?: null,
+      record?: null
+    ): DNSRecordChangedEventFilter
+    DNSRecordChanged(
+      node?: PromiseOrValue<BytesLike> | null,
+      name?: null,
+      resource?: null,
+      record?: null
+    ): DNSRecordChangedEventFilter
+
+    'DNSRecordDeleted(bytes32,bytes,uint16)'(
+      node?: PromiseOrValue<BytesLike> | null,
+      name?: null,
+      resource?: null
+    ): DNSRecordDeletedEventFilter
+    DNSRecordDeleted(node?: PromiseOrValue<BytesLike> | null, name?: null, resource?: null): DNSRecordDeletedEventFilter
+
+    'DNSZoneCleared(bytes32)'(node?: PromiseOrValue<BytesLike> | null): DNSZoneClearedEventFilter
+    DNSZoneCleared(node?: PromiseOrValue<BytesLike> | null): DNSZoneClearedEventFilter
+
+    'InterfaceChanged(bytes32,bytes4,address)'(
+      node?: PromiseOrValue<BytesLike> | null,
+      interfaceID?: PromiseOrValue<BytesLike> | null,
+      implementer?: null
+    ): InterfaceChangedEventFilter
+    InterfaceChanged(
+      node?: PromiseOrValue<BytesLike> | null,
+      interfaceID?: PromiseOrValue<BytesLike> | null,
+      implementer?: null
+    ): InterfaceChangedEventFilter
+
+    'NameChanged(bytes32,string)'(node?: PromiseOrValue<BytesLike> | null, name?: null): NameChangedEventFilter
+    NameChanged(node?: PromiseOrValue<BytesLike> | null, name?: null): NameChangedEventFilter
+
+    'PubkeyChanged(bytes32,bytes32,bytes32)'(
+      node?: PromiseOrValue<BytesLike> | null,
+      x?: null,
+      y?: null
+    ): PubkeyChangedEventFilter
+    PubkeyChanged(node?: PromiseOrValue<BytesLike> | null, x?: null, y?: null): PubkeyChangedEventFilter
+
+    'TextChanged(bytes32,string,string)'(
+      node?: PromiseOrValue<BytesLike> | null,
+      indexedKey?: PromiseOrValue<string> | null,
+      key?: null
+    ): TextChangedEventFilter
+    TextChanged(
+      node?: PromiseOrValue<BytesLike> | null,
+      indexedKey?: PromiseOrValue<string> | null,
+      key?: null
+    ): TextChangedEventFilter
+  }
+
+  estimateGas: {
+    ABI(
+      node: PromiseOrValue<BytesLike>,
+      contentTypes: PromiseOrValue<BigNumberish>,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>
+
+    addr(node: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<BigNumber>
+
+    authorisations(
+      arg0: PromiseOrValue<BytesLike>,
+      arg1: PromiseOrValue<string>,
+      arg2: PromiseOrValue<string>,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>
+
+    clearDNSZone(
+      node: PromiseOrValue<BytesLike>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<BigNumber>
+
+    contenthash(node: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<BigNumber>
+
+    dnsRecord(
+      node: PromiseOrValue<BytesLike>,
+      name: PromiseOrValue<BytesLike>,
+      resource: PromiseOrValue<BigNumberish>,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>
+
+    hasDNSRecords(
+      node: PromiseOrValue<BytesLike>,
+      name: PromiseOrValue<BytesLike>,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>
+
+    interfaceImplementer(
+      node: PromiseOrValue<BytesLike>,
+      interfaceID: PromiseOrValue<BytesLike>,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>
+
+    name(node: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<BigNumber>
+
+    pubkey(node: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<BigNumber>
+
+    setABI(
+      node: PromiseOrValue<BytesLike>,
+      contentType: PromiseOrValue<BigNumberish>,
+      data: PromiseOrValue<BytesLike>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<BigNumber>
+
+    'setAddr(bytes32,uint256,bytes)'(
+      node: PromiseOrValue<BytesLike>,
+      coinType: PromiseOrValue<BigNumberish>,
+      a: PromiseOrValue<BytesLike>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<BigNumber>
+
+    'setAddr(bytes32,address)'(
+      node: PromiseOrValue<BytesLike>,
+      a: PromiseOrValue<string>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<BigNumber>
+
+    setAuthorisation(
+      node: PromiseOrValue<BytesLike>,
+      target: PromiseOrValue<string>,
+      isAuthorised: PromiseOrValue<boolean>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<BigNumber>
+
+    setContenthash(
+      node: PromiseOrValue<BytesLike>,
+      hash: PromiseOrValue<BytesLike>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<BigNumber>
+
+    setDNSRecords(
+      node: PromiseOrValue<BytesLike>,
+      data: PromiseOrValue<BytesLike>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<BigNumber>
+
+    setInterface(
+      node: PromiseOrValue<BytesLike>,
+      interfaceID: PromiseOrValue<BytesLike>,
+      implementer: PromiseOrValue<string>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<BigNumber>
+
+    setName(
+      node: PromiseOrValue<BytesLike>,
+      name: PromiseOrValue<string>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<BigNumber>
+
+    setPubkey(
+      node: PromiseOrValue<BytesLike>,
+      x: PromiseOrValue<BytesLike>,
+      y: PromiseOrValue<BytesLike>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<BigNumber>
+
+    setText(
+      node: PromiseOrValue<BytesLike>,
+      key: PromiseOrValue<string>,
+      value: PromiseOrValue<string>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<BigNumber>
+
+    supportsInterface(interfaceID: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<BigNumber>
+
+    text(node: PromiseOrValue<BytesLike>, key: PromiseOrValue<string>, overrides?: CallOverrides): Promise<BigNumber>
+  }
+
+  populateTransaction: {
+    ABI(
+      node: PromiseOrValue<BytesLike>,
+      contentTypes: PromiseOrValue<BigNumberish>,
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>
+
+    addr(node: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<PopulatedTransaction>
+
+    authorisations(
+      arg0: PromiseOrValue<BytesLike>,
+      arg1: PromiseOrValue<string>,
+      arg2: PromiseOrValue<string>,
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>
+
+    clearDNSZone(
+      node: PromiseOrValue<BytesLike>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<PopulatedTransaction>
+
+    contenthash(node: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<PopulatedTransaction>
+
+    dnsRecord(
+      node: PromiseOrValue<BytesLike>,
+      name: PromiseOrValue<BytesLike>,
+      resource: PromiseOrValue<BigNumberish>,
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>
+
+    hasDNSRecords(
+      node: PromiseOrValue<BytesLike>,
+      name: PromiseOrValue<BytesLike>,
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>
+
+    interfaceImplementer(
+      node: PromiseOrValue<BytesLike>,
+      interfaceID: PromiseOrValue<BytesLike>,
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>
+
+    name(node: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<PopulatedTransaction>
+
+    pubkey(node: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<PopulatedTransaction>
+
+    setABI(
+      node: PromiseOrValue<BytesLike>,
+      contentType: PromiseOrValue<BigNumberish>,
+      data: PromiseOrValue<BytesLike>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<PopulatedTransaction>
+
+    'setAddr(bytes32,uint256,bytes)'(
+      node: PromiseOrValue<BytesLike>,
+      coinType: PromiseOrValue<BigNumberish>,
+      a: PromiseOrValue<BytesLike>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<PopulatedTransaction>
+
+    'setAddr(bytes32,address)'(
+      node: PromiseOrValue<BytesLike>,
+      a: PromiseOrValue<string>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<PopulatedTransaction>
+
+    setAuthorisation(
+      node: PromiseOrValue<BytesLike>,
+      target: PromiseOrValue<string>,
+      isAuthorised: PromiseOrValue<boolean>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<PopulatedTransaction>
+
+    setContenthash(
+      node: PromiseOrValue<BytesLike>,
+      hash: PromiseOrValue<BytesLike>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<PopulatedTransaction>
+
+    setDNSRecords(
+      node: PromiseOrValue<BytesLike>,
+      data: PromiseOrValue<BytesLike>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<PopulatedTransaction>
+
+    setInterface(
+      node: PromiseOrValue<BytesLike>,
+      interfaceID: PromiseOrValue<BytesLike>,
+      implementer: PromiseOrValue<string>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<PopulatedTransaction>
+
+    setName(
+      node: PromiseOrValue<BytesLike>,
+      name: PromiseOrValue<string>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<PopulatedTransaction>
+
+    setPubkey(
+      node: PromiseOrValue<BytesLike>,
+      x: PromiseOrValue<BytesLike>,
+      y: PromiseOrValue<BytesLike>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<PopulatedTransaction>
+
+    setText(
+      node: PromiseOrValue<BytesLike>,
+      key: PromiseOrValue<string>,
+      value: PromiseOrValue<string>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<PopulatedTransaction>
+
+    supportsInterface(interfaceID: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<PopulatedTransaction>
+
+    text(
+      node: PromiseOrValue<BytesLike>,
+      key: PromiseOrValue<string>,
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>
+  }
+}
diff --git a/src/libs/abis/src/generated/legacy/EnsRegistrar.ts b/src/libs/abis/src/generated/legacy/EnsRegistrar.ts
new file mode 100644
index 0000000000..715ded0564
--- /dev/null
+++ b/src/libs/abis/src/generated/legacy/EnsRegistrar.ts
@@ -0,0 +1,540 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+import type {
+  BaseContract,
+  BigNumber,
+  BigNumberish,
+  BytesLike,
+  CallOverrides,
+  ContractTransaction,
+  Overrides,
+  PopulatedTransaction,
+  Signer,
+  utils,
+} from 'ethers'
+import type { FunctionFragment, Result, EventFragment } from '@ethersproject/abi'
+import type { Listener, Provider } from '@ethersproject/providers'
+import type { TypedEventFilter, TypedEvent, TypedListener, OnEvent, PromiseOrValue } from './common'
+
+export interface EnsRegistrarInterface extends utils.Interface {
+  functions: {
+    'isApprovedForAll(address,address)': FunctionFragment
+    'old()': FunctionFragment
+    'owner(bytes32)': FunctionFragment
+    'recordExists(bytes32)': FunctionFragment
+    'resolver(bytes32)': FunctionFragment
+    'setApprovalForAll(address,bool)': FunctionFragment
+    'setOwner(bytes32,address)': FunctionFragment
+    'setRecord(bytes32,address,address,uint64)': FunctionFragment
+    'setResolver(bytes32,address)': FunctionFragment
+    'setSubnodeOwner(bytes32,bytes32,address)': FunctionFragment
+    'setSubnodeRecord(bytes32,bytes32,address,address,uint64)': FunctionFragment
+    'setTTL(bytes32,uint64)': FunctionFragment
+    'ttl(bytes32)': FunctionFragment
+  }
+
+  getFunction(
+    nameOrSignatureOrTopic:
+      | 'isApprovedForAll'
+      | 'old'
+      | 'owner'
+      | 'recordExists'
+      | 'resolver'
+      | 'setApprovalForAll'
+      | 'setOwner'
+      | 'setRecord'
+      | 'setResolver'
+      | 'setSubnodeOwner'
+      | 'setSubnodeRecord'
+      | 'setTTL'
+      | 'ttl'
+  ): FunctionFragment
+
+  encodeFunctionData(
+    functionFragment: 'isApprovedForAll',
+    values: [PromiseOrValue<string>, PromiseOrValue<string>]
+  ): string
+  encodeFunctionData(functionFragment: 'old', values?: undefined): string
+  encodeFunctionData(functionFragment: 'owner', values: [PromiseOrValue<BytesLike>]): string
+  encodeFunctionData(functionFragment: 'recordExists', values: [PromiseOrValue<BytesLike>]): string
+  encodeFunctionData(functionFragment: 'resolver', values: [PromiseOrValue<BytesLike>]): string
+  encodeFunctionData(
+    functionFragment: 'setApprovalForAll',
+    values: [PromiseOrValue<string>, PromiseOrValue<boolean>]
+  ): string
+  encodeFunctionData(functionFragment: 'setOwner', values: [PromiseOrValue<BytesLike>, PromiseOrValue<string>]): string
+  encodeFunctionData(
+    functionFragment: 'setRecord',
+    values: [PromiseOrValue<BytesLike>, PromiseOrValue<string>, PromiseOrValue<string>, PromiseOrValue<BigNumberish>]
+  ): string
+  encodeFunctionData(
+    functionFragment: 'setResolver',
+    values: [PromiseOrValue<BytesLike>, PromiseOrValue<string>]
+  ): string
+  encodeFunctionData(
+    functionFragment: 'setSubnodeOwner',
+    values: [PromiseOrValue<BytesLike>, PromiseOrValue<BytesLike>, PromiseOrValue<string>]
+  ): string
+  encodeFunctionData(
+    functionFragment: 'setSubnodeRecord',
+    values: [
+      PromiseOrValue<BytesLike>,
+      PromiseOrValue<BytesLike>,
+      PromiseOrValue<string>,
+      PromiseOrValue<string>,
+      PromiseOrValue<BigNumberish>
+    ]
+  ): string
+  encodeFunctionData(
+    functionFragment: 'setTTL',
+    values: [PromiseOrValue<BytesLike>, PromiseOrValue<BigNumberish>]
+  ): string
+  encodeFunctionData(functionFragment: 'ttl', values: [PromiseOrValue<BytesLike>]): string
+
+  decodeFunctionResult(functionFragment: 'isApprovedForAll', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'old', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'owner', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'recordExists', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'resolver', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'setApprovalForAll', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'setOwner', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'setRecord', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'setResolver', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'setSubnodeOwner', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'setSubnodeRecord', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'setTTL', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'ttl', data: BytesLike): Result
+
+  events: {
+    'ApprovalForAll(address,address,bool)': EventFragment
+    'NewOwner(bytes32,bytes32,address)': EventFragment
+    'NewResolver(bytes32,address)': EventFragment
+    'NewTTL(bytes32,uint64)': EventFragment
+    'Transfer(bytes32,address)': EventFragment
+  }
+
+  getEvent(nameOrSignatureOrTopic: 'ApprovalForAll'): EventFragment
+  getEvent(nameOrSignatureOrTopic: 'NewOwner'): EventFragment
+  getEvent(nameOrSignatureOrTopic: 'NewResolver'): EventFragment
+  getEvent(nameOrSignatureOrTopic: 'NewTTL'): EventFragment
+  getEvent(nameOrSignatureOrTopic: 'Transfer'): EventFragment
+}
+
+export interface ApprovalForAllEventObject {
+  owner: string
+  operator: string
+  approved: boolean
+}
+export type ApprovalForAllEvent = TypedEvent<[string, string, boolean], ApprovalForAllEventObject>
+
+export type ApprovalForAllEventFilter = TypedEventFilter<ApprovalForAllEvent>
+
+export interface NewOwnerEventObject {
+  node: string
+  label: string
+  owner: string
+}
+export type NewOwnerEvent = TypedEvent<[string, string, string], NewOwnerEventObject>
+
+export type NewOwnerEventFilter = TypedEventFilter<NewOwnerEvent>
+
+export interface NewResolverEventObject {
+  node: string
+  resolver: string
+}
+export type NewResolverEvent = TypedEvent<[string, string], NewResolverEventObject>
+
+export type NewResolverEventFilter = TypedEventFilter<NewResolverEvent>
+
+export interface NewTTLEventObject {
+  node: string
+  ttl: BigNumber
+}
+export type NewTTLEvent = TypedEvent<[string, BigNumber], NewTTLEventObject>
+
+export type NewTTLEventFilter = TypedEventFilter<NewTTLEvent>
+
+export interface TransferEventObject {
+  node: string
+  owner: string
+}
+export type TransferEvent = TypedEvent<[string, string], TransferEventObject>
+
+export type TransferEventFilter = TypedEventFilter<TransferEvent>
+
+export interface EnsRegistrar extends BaseContract {
+  connect(signerOrProvider: Signer | Provider | string): this
+  attach(addressOrName: string): this
+  deployed(): Promise<this>
+
+  interface: EnsRegistrarInterface
+
+  queryFilter<TEvent extends TypedEvent>(
+    event: TypedEventFilter<TEvent>,
+    fromBlockOrBlockhash?: string | number | undefined,
+    toBlock?: string | number | undefined
+  ): Promise<Array<TEvent>>
+
+  listeners<TEvent extends TypedEvent>(eventFilter?: TypedEventFilter<TEvent>): Array<TypedListener<TEvent>>
+  listeners(eventName?: string): Array<Listener>
+  removeAllListeners<TEvent extends TypedEvent>(eventFilter: TypedEventFilter<TEvent>): this
+  removeAllListeners(eventName?: string): this
+  off: OnEvent<this>
+  on: OnEvent<this>
+  once: OnEvent<this>
+  removeListener: OnEvent<this>
+
+  functions: {
+    isApprovedForAll(
+      owner: PromiseOrValue<string>,
+      operator: PromiseOrValue<string>,
+      overrides?: CallOverrides
+    ): Promise<[boolean]>
+
+    old(overrides?: CallOverrides): Promise<[string]>
+
+    owner(node: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<[string]>
+
+    recordExists(node: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<[boolean]>
+
+    resolver(node: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<[string]>
+
+    setApprovalForAll(
+      operator: PromiseOrValue<string>,
+      approved: PromiseOrValue<boolean>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<ContractTransaction>
+
+    setOwner(
+      node: PromiseOrValue<BytesLike>,
+      owner: PromiseOrValue<string>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<ContractTransaction>
+
+    setRecord(
+      node: PromiseOrValue<BytesLike>,
+      owner: PromiseOrValue<string>,
+      resolver: PromiseOrValue<string>,
+      ttl: PromiseOrValue<BigNumberish>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<ContractTransaction>
+
+    setResolver(
+      node: PromiseOrValue<BytesLike>,
+      resolver: PromiseOrValue<string>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<ContractTransaction>
+
+    setSubnodeOwner(
+      node: PromiseOrValue<BytesLike>,
+      label: PromiseOrValue<BytesLike>,
+      owner: PromiseOrValue<string>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<ContractTransaction>
+
+    setSubnodeRecord(
+      node: PromiseOrValue<BytesLike>,
+      label: PromiseOrValue<BytesLike>,
+      owner: PromiseOrValue<string>,
+      resolver: PromiseOrValue<string>,
+      ttl: PromiseOrValue<BigNumberish>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<ContractTransaction>
+
+    setTTL(
+      node: PromiseOrValue<BytesLike>,
+      ttl: PromiseOrValue<BigNumberish>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<ContractTransaction>
+
+    ttl(node: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<[BigNumber]>
+  }
+
+  isApprovedForAll(
+    owner: PromiseOrValue<string>,
+    operator: PromiseOrValue<string>,
+    overrides?: CallOverrides
+  ): Promise<boolean>
+
+  old(overrides?: CallOverrides): Promise<string>
+
+  owner(node: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<string>
+
+  recordExists(node: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<boolean>
+
+  resolver(node: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<string>
+
+  setApprovalForAll(
+    operator: PromiseOrValue<string>,
+    approved: PromiseOrValue<boolean>,
+    overrides?: Overrides & { from?: PromiseOrValue<string> }
+  ): Promise<ContractTransaction>
+
+  setOwner(
+    node: PromiseOrValue<BytesLike>,
+    owner: PromiseOrValue<string>,
+    overrides?: Overrides & { from?: PromiseOrValue<string> }
+  ): Promise<ContractTransaction>
+
+  setRecord(
+    node: PromiseOrValue<BytesLike>,
+    owner: PromiseOrValue<string>,
+    resolver: PromiseOrValue<string>,
+    ttl: PromiseOrValue<BigNumberish>,
+    overrides?: Overrides & { from?: PromiseOrValue<string> }
+  ): Promise<ContractTransaction>
+
+  setResolver(
+    node: PromiseOrValue<BytesLike>,
+    resolver: PromiseOrValue<string>,
+    overrides?: Overrides & { from?: PromiseOrValue<string> }
+  ): Promise<ContractTransaction>
+
+  setSubnodeOwner(
+    node: PromiseOrValue<BytesLike>,
+    label: PromiseOrValue<BytesLike>,
+    owner: PromiseOrValue<string>,
+    overrides?: Overrides & { from?: PromiseOrValue<string> }
+  ): Promise<ContractTransaction>
+
+  setSubnodeRecord(
+    node: PromiseOrValue<BytesLike>,
+    label: PromiseOrValue<BytesLike>,
+    owner: PromiseOrValue<string>,
+    resolver: PromiseOrValue<string>,
+    ttl: PromiseOrValue<BigNumberish>,
+    overrides?: Overrides & { from?: PromiseOrValue<string> }
+  ): Promise<ContractTransaction>
+
+  setTTL(
+    node: PromiseOrValue<BytesLike>,
+    ttl: PromiseOrValue<BigNumberish>,
+    overrides?: Overrides & { from?: PromiseOrValue<string> }
+  ): Promise<ContractTransaction>
+
+  ttl(node: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<BigNumber>
+
+  callStatic: {
+    isApprovedForAll(
+      owner: PromiseOrValue<string>,
+      operator: PromiseOrValue<string>,
+      overrides?: CallOverrides
+    ): Promise<boolean>
+
+    old(overrides?: CallOverrides): Promise<string>
+
+    owner(node: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<string>
+
+    recordExists(node: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<boolean>
+
+    resolver(node: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<string>
+
+    setApprovalForAll(
+      operator: PromiseOrValue<string>,
+      approved: PromiseOrValue<boolean>,
+      overrides?: CallOverrides
+    ): Promise<void>
+
+    setOwner(node: PromiseOrValue<BytesLike>, owner: PromiseOrValue<string>, overrides?: CallOverrides): Promise<void>
+
+    setRecord(
+      node: PromiseOrValue<BytesLike>,
+      owner: PromiseOrValue<string>,
+      resolver: PromiseOrValue<string>,
+      ttl: PromiseOrValue<BigNumberish>,
+      overrides?: CallOverrides
+    ): Promise<void>
+
+    setResolver(
+      node: PromiseOrValue<BytesLike>,
+      resolver: PromiseOrValue<string>,
+      overrides?: CallOverrides
+    ): Promise<void>
+
+    setSubnodeOwner(
+      node: PromiseOrValue<BytesLike>,
+      label: PromiseOrValue<BytesLike>,
+      owner: PromiseOrValue<string>,
+      overrides?: CallOverrides
+    ): Promise<string>
+
+    setSubnodeRecord(
+      node: PromiseOrValue<BytesLike>,
+      label: PromiseOrValue<BytesLike>,
+      owner: PromiseOrValue<string>,
+      resolver: PromiseOrValue<string>,
+      ttl: PromiseOrValue<BigNumberish>,
+      overrides?: CallOverrides
+    ): Promise<void>
+
+    setTTL(node: PromiseOrValue<BytesLike>, ttl: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>
+
+    ttl(node: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<BigNumber>
+  }
+
+  filters: {
+    'ApprovalForAll(address,address,bool)'(
+      owner?: PromiseOrValue<string> | null,
+      operator?: PromiseOrValue<string> | null,
+      approved?: null
+    ): ApprovalForAllEventFilter
+    ApprovalForAll(
+      owner?: PromiseOrValue<string> | null,
+      operator?: PromiseOrValue<string> | null,
+      approved?: null
+    ): ApprovalForAllEventFilter
+
+    'NewOwner(bytes32,bytes32,address)'(
+      node?: PromiseOrValue<BytesLike> | null,
+      label?: PromiseOrValue<BytesLike> | null,
+      owner?: null
+    ): NewOwnerEventFilter
+    NewOwner(
+      node?: PromiseOrValue<BytesLike> | null,
+      label?: PromiseOrValue<BytesLike> | null,
+      owner?: null
+    ): NewOwnerEventFilter
+
+    'NewResolver(bytes32,address)'(node?: PromiseOrValue<BytesLike> | null, resolver?: null): NewResolverEventFilter
+    NewResolver(node?: PromiseOrValue<BytesLike> | null, resolver?: null): NewResolverEventFilter
+
+    'NewTTL(bytes32,uint64)'(node?: PromiseOrValue<BytesLike> | null, ttl?: null): NewTTLEventFilter
+    NewTTL(node?: PromiseOrValue<BytesLike> | null, ttl?: null): NewTTLEventFilter
+
+    'Transfer(bytes32,address)'(node?: PromiseOrValue<BytesLike> | null, owner?: null): TransferEventFilter
+    Transfer(node?: PromiseOrValue<BytesLike> | null, owner?: null): TransferEventFilter
+  }
+
+  estimateGas: {
+    isApprovedForAll(
+      owner: PromiseOrValue<string>,
+      operator: PromiseOrValue<string>,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>
+
+    old(overrides?: CallOverrides): Promise<BigNumber>
+
+    owner(node: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<BigNumber>
+
+    recordExists(node: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<BigNumber>
+
+    resolver(node: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<BigNumber>
+
+    setApprovalForAll(
+      operator: PromiseOrValue<string>,
+      approved: PromiseOrValue<boolean>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<BigNumber>
+
+    setOwner(
+      node: PromiseOrValue<BytesLike>,
+      owner: PromiseOrValue<string>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<BigNumber>
+
+    setRecord(
+      node: PromiseOrValue<BytesLike>,
+      owner: PromiseOrValue<string>,
+      resolver: PromiseOrValue<string>,
+      ttl: PromiseOrValue<BigNumberish>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<BigNumber>
+
+    setResolver(
+      node: PromiseOrValue<BytesLike>,
+      resolver: PromiseOrValue<string>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<BigNumber>
+
+    setSubnodeOwner(
+      node: PromiseOrValue<BytesLike>,
+      label: PromiseOrValue<BytesLike>,
+      owner: PromiseOrValue<string>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<BigNumber>
+
+    setSubnodeRecord(
+      node: PromiseOrValue<BytesLike>,
+      label: PromiseOrValue<BytesLike>,
+      owner: PromiseOrValue<string>,
+      resolver: PromiseOrValue<string>,
+      ttl: PromiseOrValue<BigNumberish>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<BigNumber>
+
+    setTTL(
+      node: PromiseOrValue<BytesLike>,
+      ttl: PromiseOrValue<BigNumberish>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<BigNumber>
+
+    ttl(node: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<BigNumber>
+  }
+
+  populateTransaction: {
+    isApprovedForAll(
+      owner: PromiseOrValue<string>,
+      operator: PromiseOrValue<string>,
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>
+
+    old(overrides?: CallOverrides): Promise<PopulatedTransaction>
+
+    owner(node: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<PopulatedTransaction>
+
+    recordExists(node: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<PopulatedTransaction>
+
+    resolver(node: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<PopulatedTransaction>
+
+    setApprovalForAll(
+      operator: PromiseOrValue<string>,
+      approved: PromiseOrValue<boolean>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<PopulatedTransaction>
+
+    setOwner(
+      node: PromiseOrValue<BytesLike>,
+      owner: PromiseOrValue<string>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<PopulatedTransaction>
+
+    setRecord(
+      node: PromiseOrValue<BytesLike>,
+      owner: PromiseOrValue<string>,
+      resolver: PromiseOrValue<string>,
+      ttl: PromiseOrValue<BigNumberish>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<PopulatedTransaction>
+
+    setResolver(
+      node: PromiseOrValue<BytesLike>,
+      resolver: PromiseOrValue<string>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<PopulatedTransaction>
+
+    setSubnodeOwner(
+      node: PromiseOrValue<BytesLike>,
+      label: PromiseOrValue<BytesLike>,
+      owner: PromiseOrValue<string>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<PopulatedTransaction>
+
+    setSubnodeRecord(
+      node: PromiseOrValue<BytesLike>,
+      label: PromiseOrValue<BytesLike>,
+      owner: PromiseOrValue<string>,
+      resolver: PromiseOrValue<string>,
+      ttl: PromiseOrValue<BigNumberish>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<PopulatedTransaction>
+
+    setTTL(
+      node: PromiseOrValue<BytesLike>,
+      ttl: PromiseOrValue<BigNumberish>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<PopulatedTransaction>
+
+    ttl(node: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<PopulatedTransaction>
+  }
+}
diff --git a/src/libs/abis/src/generated/legacy/Erc1155.ts b/src/libs/abis/src/generated/legacy/Erc1155.ts
new file mode 100644
index 0000000000..669ad51009
--- /dev/null
+++ b/src/libs/abis/src/generated/legacy/Erc1155.ts
@@ -0,0 +1,109 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+import type {
+  BaseContract,
+  BigNumber,
+  BigNumberish,
+  BytesLike,
+  CallOverrides,
+  PopulatedTransaction,
+  Signer,
+  utils,
+} from 'ethers'
+import type { FunctionFragment, Result } from '@ethersproject/abi'
+import type { Listener, Provider } from '@ethersproject/providers'
+import type { TypedEventFilter, TypedEvent, TypedListener, OnEvent, PromiseOrValue } from './common'
+
+export interface Erc1155Interface extends utils.Interface {
+  functions: {
+    'balanceOf(address,uint256)': FunctionFragment
+    'uri(uint256)': FunctionFragment
+  }
+
+  getFunction(nameOrSignatureOrTopic: 'balanceOf' | 'uri'): FunctionFragment
+
+  encodeFunctionData(
+    functionFragment: 'balanceOf',
+    values: [PromiseOrValue<string>, PromiseOrValue<BigNumberish>]
+  ): string
+  encodeFunctionData(functionFragment: 'uri', values: [PromiseOrValue<BigNumberish>]): string
+
+  decodeFunctionResult(functionFragment: 'balanceOf', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'uri', data: BytesLike): Result
+
+  events: {}
+}
+
+export interface Erc1155 extends BaseContract {
+  connect(signerOrProvider: Signer | Provider | string): this
+  attach(addressOrName: string): this
+  deployed(): Promise<this>
+
+  interface: Erc1155Interface
+
+  queryFilter<TEvent extends TypedEvent>(
+    event: TypedEventFilter<TEvent>,
+    fromBlockOrBlockhash?: string | number | undefined,
+    toBlock?: string | number | undefined
+  ): Promise<Array<TEvent>>
+
+  listeners<TEvent extends TypedEvent>(eventFilter?: TypedEventFilter<TEvent>): Array<TypedListener<TEvent>>
+  listeners(eventName?: string): Array<Listener>
+  removeAllListeners<TEvent extends TypedEvent>(eventFilter: TypedEventFilter<TEvent>): this
+  removeAllListeners(eventName?: string): this
+  off: OnEvent<this>
+  on: OnEvent<this>
+  once: OnEvent<this>
+  removeListener: OnEvent<this>
+
+  functions: {
+    balanceOf(
+      _owner: PromiseOrValue<string>,
+      _id: PromiseOrValue<BigNumberish>,
+      overrides?: CallOverrides
+    ): Promise<[BigNumber]>
+
+    uri(_id: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[string]>
+  }
+
+  balanceOf(
+    _owner: PromiseOrValue<string>,
+    _id: PromiseOrValue<BigNumberish>,
+    overrides?: CallOverrides
+  ): Promise<BigNumber>
+
+  uri(_id: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<string>
+
+  callStatic: {
+    balanceOf(
+      _owner: PromiseOrValue<string>,
+      _id: PromiseOrValue<BigNumberish>,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>
+
+    uri(_id: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<string>
+  }
+
+  filters: {}
+
+  estimateGas: {
+    balanceOf(
+      _owner: PromiseOrValue<string>,
+      _id: PromiseOrValue<BigNumberish>,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>
+
+    uri(_id: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>
+  }
+
+  populateTransaction: {
+    balanceOf(
+      _owner: PromiseOrValue<string>,
+      _id: PromiseOrValue<BigNumberish>,
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>
+
+    uri(_id: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>
+  }
+}
diff --git a/src/libs/abis/src/generated/legacy/Erc20.ts b/src/libs/abis/src/generated/legacy/Erc20.ts
new file mode 100644
index 0000000000..54c74b62a9
--- /dev/null
+++ b/src/libs/abis/src/generated/legacy/Erc20.ts
@@ -0,0 +1,330 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+import type {
+  BaseContract,
+  BigNumber,
+  BigNumberish,
+  BytesLike,
+  CallOverrides,
+  ContractTransaction,
+  Overrides,
+  PopulatedTransaction,
+  Signer,
+  utils,
+} from 'ethers'
+import type { FunctionFragment, Result, EventFragment } from '@ethersproject/abi'
+import type { Listener, Provider } from '@ethersproject/providers'
+import type { TypedEventFilter, TypedEvent, TypedListener, OnEvent, PromiseOrValue } from './common'
+
+export interface Erc20Interface extends utils.Interface {
+  functions: {
+    'name()': FunctionFragment
+    'approve(address,uint256)': FunctionFragment
+    'totalSupply()': FunctionFragment
+    'transferFrom(address,address,uint256)': FunctionFragment
+    'decimals()': FunctionFragment
+    'balanceOf(address)': FunctionFragment
+    'symbol()': FunctionFragment
+    'transfer(address,uint256)': FunctionFragment
+    'allowance(address,address)': FunctionFragment
+  }
+
+  getFunction(
+    nameOrSignatureOrTopic:
+      | 'name'
+      | 'approve'
+      | 'totalSupply'
+      | 'transferFrom'
+      | 'decimals'
+      | 'balanceOf'
+      | 'symbol'
+      | 'transfer'
+      | 'allowance'
+  ): FunctionFragment
+
+  encodeFunctionData(functionFragment: 'name', values?: undefined): string
+  encodeFunctionData(
+    functionFragment: 'approve',
+    values: [PromiseOrValue<string>, PromiseOrValue<BigNumberish>]
+  ): string
+  encodeFunctionData(functionFragment: 'totalSupply', values?: undefined): string
+  encodeFunctionData(
+    functionFragment: 'transferFrom',
+    values: [PromiseOrValue<string>, PromiseOrValue<string>, PromiseOrValue<BigNumberish>]
+  ): string
+  encodeFunctionData(functionFragment: 'decimals', values?: undefined): string
+  encodeFunctionData(functionFragment: 'balanceOf', values: [PromiseOrValue<string>]): string
+  encodeFunctionData(functionFragment: 'symbol', values?: undefined): string
+  encodeFunctionData(
+    functionFragment: 'transfer',
+    values: [PromiseOrValue<string>, PromiseOrValue<BigNumberish>]
+  ): string
+  encodeFunctionData(functionFragment: 'allowance', values: [PromiseOrValue<string>, PromiseOrValue<string>]): string
+
+  decodeFunctionResult(functionFragment: 'name', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'approve', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'totalSupply', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'transferFrom', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'decimals', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'balanceOf', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'symbol', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'transfer', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'allowance', data: BytesLike): Result
+
+  events: {
+    'Approval(address,address,uint256)': EventFragment
+    'Transfer(address,address,uint256)': EventFragment
+  }
+
+  getEvent(nameOrSignatureOrTopic: 'Approval'): EventFragment
+  getEvent(nameOrSignatureOrTopic: 'Transfer'): EventFragment
+}
+
+export interface ApprovalEventObject {
+  owner: string
+  spender: string
+  value: BigNumber
+}
+export type ApprovalEvent = TypedEvent<[string, string, BigNumber], ApprovalEventObject>
+
+export type ApprovalEventFilter = TypedEventFilter<ApprovalEvent>
+
+export interface TransferEventObject {
+  from: string
+  to: string
+  value: BigNumber
+}
+export type TransferEvent = TypedEvent<[string, string, BigNumber], TransferEventObject>
+
+export type TransferEventFilter = TypedEventFilter<TransferEvent>
+
+export interface Erc20 extends BaseContract {
+  connect(signerOrProvider: Signer | Provider | string): this
+  attach(addressOrName: string): this
+  deployed(): Promise<this>
+
+  interface: Erc20Interface
+
+  queryFilter<TEvent extends TypedEvent>(
+    event: TypedEventFilter<TEvent>,
+    fromBlockOrBlockhash?: string | number | undefined,
+    toBlock?: string | number | undefined
+  ): Promise<Array<TEvent>>
+
+  listeners<TEvent extends TypedEvent>(eventFilter?: TypedEventFilter<TEvent>): Array<TypedListener<TEvent>>
+  listeners(eventName?: string): Array<Listener>
+  removeAllListeners<TEvent extends TypedEvent>(eventFilter: TypedEventFilter<TEvent>): this
+  removeAllListeners(eventName?: string): this
+  off: OnEvent<this>
+  on: OnEvent<this>
+  once: OnEvent<this>
+  removeListener: OnEvent<this>
+
+  functions: {
+    name(overrides?: CallOverrides): Promise<[string]>
+
+    approve(
+      _spender: PromiseOrValue<string>,
+      _value: PromiseOrValue<BigNumberish>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<ContractTransaction>
+
+    totalSupply(overrides?: CallOverrides): Promise<[BigNumber]>
+
+    transferFrom(
+      _from: PromiseOrValue<string>,
+      _to: PromiseOrValue<string>,
+      _value: PromiseOrValue<BigNumberish>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<ContractTransaction>
+
+    decimals(overrides?: CallOverrides): Promise<[number]>
+
+    balanceOf(_owner: PromiseOrValue<string>, overrides?: CallOverrides): Promise<[BigNumber] & { balance: BigNumber }>
+
+    symbol(overrides?: CallOverrides): Promise<[string]>
+
+    transfer(
+      _to: PromiseOrValue<string>,
+      _value: PromiseOrValue<BigNumberish>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<ContractTransaction>
+
+    allowance(
+      _owner: PromiseOrValue<string>,
+      _spender: PromiseOrValue<string>,
+      overrides?: CallOverrides
+    ): Promise<[BigNumber]>
+  }
+
+  name(overrides?: CallOverrides): Promise<string>
+
+  approve(
+    _spender: PromiseOrValue<string>,
+    _value: PromiseOrValue<BigNumberish>,
+    overrides?: Overrides & { from?: PromiseOrValue<string> }
+  ): Promise<ContractTransaction>
+
+  totalSupply(overrides?: CallOverrides): Promise<BigNumber>
+
+  transferFrom(
+    _from: PromiseOrValue<string>,
+    _to: PromiseOrValue<string>,
+    _value: PromiseOrValue<BigNumberish>,
+    overrides?: Overrides & { from?: PromiseOrValue<string> }
+  ): Promise<ContractTransaction>
+
+  decimals(overrides?: CallOverrides): Promise<number>
+
+  balanceOf(_owner: PromiseOrValue<string>, overrides?: CallOverrides): Promise<BigNumber>
+
+  symbol(overrides?: CallOverrides): Promise<string>
+
+  transfer(
+    _to: PromiseOrValue<string>,
+    _value: PromiseOrValue<BigNumberish>,
+    overrides?: Overrides & { from?: PromiseOrValue<string> }
+  ): Promise<ContractTransaction>
+
+  allowance(
+    _owner: PromiseOrValue<string>,
+    _spender: PromiseOrValue<string>,
+    overrides?: CallOverrides
+  ): Promise<BigNumber>
+
+  callStatic: {
+    name(overrides?: CallOverrides): Promise<string>
+
+    approve(
+      _spender: PromiseOrValue<string>,
+      _value: PromiseOrValue<BigNumberish>,
+      overrides?: CallOverrides
+    ): Promise<boolean>
+
+    totalSupply(overrides?: CallOverrides): Promise<BigNumber>
+
+    transferFrom(
+      _from: PromiseOrValue<string>,
+      _to: PromiseOrValue<string>,
+      _value: PromiseOrValue<BigNumberish>,
+      overrides?: CallOverrides
+    ): Promise<boolean>
+
+    decimals(overrides?: CallOverrides): Promise<number>
+
+    balanceOf(_owner: PromiseOrValue<string>, overrides?: CallOverrides): Promise<BigNumber>
+
+    symbol(overrides?: CallOverrides): Promise<string>
+
+    transfer(
+      _to: PromiseOrValue<string>,
+      _value: PromiseOrValue<BigNumberish>,
+      overrides?: CallOverrides
+    ): Promise<boolean>
+
+    allowance(
+      _owner: PromiseOrValue<string>,
+      _spender: PromiseOrValue<string>,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>
+  }
+
+  filters: {
+    'Approval(address,address,uint256)'(
+      owner?: PromiseOrValue<string> | null,
+      spender?: PromiseOrValue<string> | null,
+      value?: null
+    ): ApprovalEventFilter
+    Approval(
+      owner?: PromiseOrValue<string> | null,
+      spender?: PromiseOrValue<string> | null,
+      value?: null
+    ): ApprovalEventFilter
+
+    'Transfer(address,address,uint256)'(
+      from?: PromiseOrValue<string> | null,
+      to?: PromiseOrValue<string> | null,
+      value?: null
+    ): TransferEventFilter
+    Transfer(
+      from?: PromiseOrValue<string> | null,
+      to?: PromiseOrValue<string> | null,
+      value?: null
+    ): TransferEventFilter
+  }
+
+  estimateGas: {
+    name(overrides?: CallOverrides): Promise<BigNumber>
+
+    approve(
+      _spender: PromiseOrValue<string>,
+      _value: PromiseOrValue<BigNumberish>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<BigNumber>
+
+    totalSupply(overrides?: CallOverrides): Promise<BigNumber>
+
+    transferFrom(
+      _from: PromiseOrValue<string>,
+      _to: PromiseOrValue<string>,
+      _value: PromiseOrValue<BigNumberish>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<BigNumber>
+
+    decimals(overrides?: CallOverrides): Promise<BigNumber>
+
+    balanceOf(_owner: PromiseOrValue<string>, overrides?: CallOverrides): Promise<BigNumber>
+
+    symbol(overrides?: CallOverrides): Promise<BigNumber>
+
+    transfer(
+      _to: PromiseOrValue<string>,
+      _value: PromiseOrValue<BigNumberish>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<BigNumber>
+
+    allowance(
+      _owner: PromiseOrValue<string>,
+      _spender: PromiseOrValue<string>,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>
+  }
+
+  populateTransaction: {
+    name(overrides?: CallOverrides): Promise<PopulatedTransaction>
+
+    approve(
+      _spender: PromiseOrValue<string>,
+      _value: PromiseOrValue<BigNumberish>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<PopulatedTransaction>
+
+    totalSupply(overrides?: CallOverrides): Promise<PopulatedTransaction>
+
+    transferFrom(
+      _from: PromiseOrValue<string>,
+      _to: PromiseOrValue<string>,
+      _value: PromiseOrValue<BigNumberish>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<PopulatedTransaction>
+
+    decimals(overrides?: CallOverrides): Promise<PopulatedTransaction>
+
+    balanceOf(_owner: PromiseOrValue<string>, overrides?: CallOverrides): Promise<PopulatedTransaction>
+
+    symbol(overrides?: CallOverrides): Promise<PopulatedTransaction>
+
+    transfer(
+      _to: PromiseOrValue<string>,
+      _value: PromiseOrValue<BigNumberish>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<PopulatedTransaction>
+
+    allowance(
+      _owner: PromiseOrValue<string>,
+      _spender: PromiseOrValue<string>,
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>
+  }
+}
diff --git a/src/libs/abis/src/generated/legacy/Erc20_bytes32.ts b/src/libs/abis/src/generated/legacy/Erc20_bytes32.ts
new file mode 100644
index 0000000000..0d61e2b8c9
--- /dev/null
+++ b/src/libs/abis/src/generated/legacy/Erc20_bytes32.ts
@@ -0,0 +1,77 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+import type { BaseContract, BigNumber, BytesLike, CallOverrides, PopulatedTransaction, Signer, utils } from 'ethers'
+import type { FunctionFragment, Result } from '@ethersproject/abi'
+import type { Listener, Provider } from '@ethersproject/providers'
+import type { TypedEventFilter, TypedEvent, TypedListener, OnEvent, PromiseOrValue } from './common'
+
+export interface Erc20_bytes32Interface extends utils.Interface {
+  functions: {
+    'name()': FunctionFragment
+    'symbol()': FunctionFragment
+  }
+
+  getFunction(nameOrSignatureOrTopic: 'name' | 'symbol'): FunctionFragment
+
+  encodeFunctionData(functionFragment: 'name', values?: undefined): string
+  encodeFunctionData(functionFragment: 'symbol', values?: undefined): string
+
+  decodeFunctionResult(functionFragment: 'name', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'symbol', data: BytesLike): Result
+
+  events: {}
+}
+
+export interface Erc20_bytes32 extends BaseContract {
+  connect(signerOrProvider: Signer | Provider | string): this
+  attach(addressOrName: string): this
+  deployed(): Promise<this>
+
+  interface: Erc20_bytes32Interface
+
+  queryFilter<TEvent extends TypedEvent>(
+    event: TypedEventFilter<TEvent>,
+    fromBlockOrBlockhash?: string | number | undefined,
+    toBlock?: string | number | undefined
+  ): Promise<Array<TEvent>>
+
+  listeners<TEvent extends TypedEvent>(eventFilter?: TypedEventFilter<TEvent>): Array<TypedListener<TEvent>>
+  listeners(eventName?: string): Array<Listener>
+  removeAllListeners<TEvent extends TypedEvent>(eventFilter: TypedEventFilter<TEvent>): this
+  removeAllListeners(eventName?: string): this
+  off: OnEvent<this>
+  on: OnEvent<this>
+  once: OnEvent<this>
+  removeListener: OnEvent<this>
+
+  functions: {
+    name(overrides?: CallOverrides): Promise<[string]>
+
+    symbol(overrides?: CallOverrides): Promise<[string]>
+  }
+
+  name(overrides?: CallOverrides): Promise<string>
+
+  symbol(overrides?: CallOverrides): Promise<string>
+
+  callStatic: {
+    name(overrides?: CallOverrides): Promise<string>
+
+    symbol(overrides?: CallOverrides): Promise<string>
+  }
+
+  filters: {}
+
+  estimateGas: {
+    name(overrides?: CallOverrides): Promise<BigNumber>
+
+    symbol(overrides?: CallOverrides): Promise<BigNumber>
+  }
+
+  populateTransaction: {
+    name(overrides?: CallOverrides): Promise<PopulatedTransaction>
+
+    symbol(overrides?: CallOverrides): Promise<PopulatedTransaction>
+  }
+}
diff --git a/src/libs/abis/src/generated/legacy/Erc721.ts b/src/libs/abis/src/generated/legacy/Erc721.ts
new file mode 100644
index 0000000000..83da533f90
--- /dev/null
+++ b/src/libs/abis/src/generated/legacy/Erc721.ts
@@ -0,0 +1,86 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+import type {
+  BaseContract,
+  BigNumber,
+  BigNumberish,
+  BytesLike,
+  CallOverrides,
+  PopulatedTransaction,
+  Signer,
+  utils,
+} from 'ethers'
+import type { FunctionFragment, Result } from '@ethersproject/abi'
+import type { Listener, Provider } from '@ethersproject/providers'
+import type { TypedEventFilter, TypedEvent, TypedListener, OnEvent, PromiseOrValue } from './common'
+
+export interface Erc721Interface extends utils.Interface {
+  functions: {
+    'ownerOf(uint256)': FunctionFragment
+    'tokenURI(uint256)': FunctionFragment
+  }
+
+  getFunction(nameOrSignatureOrTopic: 'ownerOf' | 'tokenURI'): FunctionFragment
+
+  encodeFunctionData(functionFragment: 'ownerOf', values: [PromiseOrValue<BigNumberish>]): string
+  encodeFunctionData(functionFragment: 'tokenURI', values: [PromiseOrValue<BigNumberish>]): string
+
+  decodeFunctionResult(functionFragment: 'ownerOf', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'tokenURI', data: BytesLike): Result
+
+  events: {}
+}
+
+export interface Erc721 extends BaseContract {
+  connect(signerOrProvider: Signer | Provider | string): this
+  attach(addressOrName: string): this
+  deployed(): Promise<this>
+
+  interface: Erc721Interface
+
+  queryFilter<TEvent extends TypedEvent>(
+    event: TypedEventFilter<TEvent>,
+    fromBlockOrBlockhash?: string | number | undefined,
+    toBlock?: string | number | undefined
+  ): Promise<Array<TEvent>>
+
+  listeners<TEvent extends TypedEvent>(eventFilter?: TypedEventFilter<TEvent>): Array<TypedListener<TEvent>>
+  listeners(eventName?: string): Array<Listener>
+  removeAllListeners<TEvent extends TypedEvent>(eventFilter: TypedEventFilter<TEvent>): this
+  removeAllListeners(eventName?: string): this
+  off: OnEvent<this>
+  on: OnEvent<this>
+  once: OnEvent<this>
+  removeListener: OnEvent<this>
+
+  functions: {
+    ownerOf(tokenId: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[string]>
+
+    tokenURI(tokenId: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[string]>
+  }
+
+  ownerOf(tokenId: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<string>
+
+  tokenURI(tokenId: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<string>
+
+  callStatic: {
+    ownerOf(tokenId: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<string>
+
+    tokenURI(tokenId: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<string>
+  }
+
+  filters: {}
+
+  estimateGas: {
+    ownerOf(tokenId: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>
+
+    tokenURI(tokenId: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>
+  }
+
+  populateTransaction: {
+    ownerOf(tokenId: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>
+
+    tokenURI(tokenId: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>
+  }
+}
diff --git a/src/libs/abis/src/generated/legacy/UniswapInterfaceMulticall.ts b/src/libs/abis/src/generated/legacy/UniswapInterfaceMulticall.ts
new file mode 100644
index 0000000000..cf4cbc0d20
--- /dev/null
+++ b/src/libs/abis/src/generated/legacy/UniswapInterfaceMulticall.ts
@@ -0,0 +1,150 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+import type {
+  BaseContract,
+  BigNumber,
+  BigNumberish,
+  BytesLike,
+  CallOverrides,
+  ContractTransaction,
+  Overrides,
+  PopulatedTransaction,
+  Signer,
+  utils,
+} from 'ethers'
+import type { FunctionFragment, Result } from '@ethersproject/abi'
+import type { Listener, Provider } from '@ethersproject/providers'
+import type { TypedEventFilter, TypedEvent, TypedListener, OnEvent, PromiseOrValue } from './common'
+
+export declare namespace UniswapInterfaceMulticall {
+  export type CallStruct = {
+    target: PromiseOrValue<string>
+    gasLimit: PromiseOrValue<BigNumberish>
+    callData: PromiseOrValue<BytesLike>
+  }
+
+  export type CallStructOutput = [string, BigNumber, string] & {
+    target: string
+    gasLimit: BigNumber
+    callData: string
+  }
+
+  export type ResultStruct = {
+    success: PromiseOrValue<boolean>
+    gasUsed: PromiseOrValue<BigNumberish>
+    returnData: PromiseOrValue<BytesLike>
+  }
+
+  export type ResultStructOutput = [boolean, BigNumber, string] & {
+    success: boolean
+    gasUsed: BigNumber
+    returnData: string
+  }
+}
+
+export interface UniswapInterfaceMulticallInterface extends utils.Interface {
+  functions: {
+    'getCurrentBlockTimestamp()': FunctionFragment
+    'getEthBalance(address)': FunctionFragment
+    'multicall((address,uint256,bytes)[])': FunctionFragment
+  }
+
+  getFunction(nameOrSignatureOrTopic: 'getCurrentBlockTimestamp' | 'getEthBalance' | 'multicall'): FunctionFragment
+
+  encodeFunctionData(functionFragment: 'getCurrentBlockTimestamp', values?: undefined): string
+  encodeFunctionData(functionFragment: 'getEthBalance', values: [PromiseOrValue<string>]): string
+  encodeFunctionData(functionFragment: 'multicall', values: [UniswapInterfaceMulticall.CallStruct[]]): string
+
+  decodeFunctionResult(functionFragment: 'getCurrentBlockTimestamp', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'getEthBalance', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'multicall', data: BytesLike): Result
+
+  events: {}
+}
+
+export interface UniswapInterfaceMulticall extends BaseContract {
+  connect(signerOrProvider: Signer | Provider | string): this
+  attach(addressOrName: string): this
+  deployed(): Promise<this>
+
+  interface: UniswapInterfaceMulticallInterface
+
+  queryFilter<TEvent extends TypedEvent>(
+    event: TypedEventFilter<TEvent>,
+    fromBlockOrBlockhash?: string | number | undefined,
+    toBlock?: string | number | undefined
+  ): Promise<Array<TEvent>>
+
+  listeners<TEvent extends TypedEvent>(eventFilter?: TypedEventFilter<TEvent>): Array<TypedListener<TEvent>>
+  listeners(eventName?: string): Array<Listener>
+  removeAllListeners<TEvent extends TypedEvent>(eventFilter: TypedEventFilter<TEvent>): this
+  removeAllListeners(eventName?: string): this
+  off: OnEvent<this>
+  on: OnEvent<this>
+  once: OnEvent<this>
+  removeListener: OnEvent<this>
+
+  functions: {
+    getCurrentBlockTimestamp(overrides?: CallOverrides): Promise<[BigNumber] & { timestamp: BigNumber }>
+
+    getEthBalance(
+      addr: PromiseOrValue<string>,
+      overrides?: CallOverrides
+    ): Promise<[BigNumber] & { balance: BigNumber }>
+
+    multicall(
+      calls: UniswapInterfaceMulticall.CallStruct[],
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<ContractTransaction>
+  }
+
+  getCurrentBlockTimestamp(overrides?: CallOverrides): Promise<BigNumber>
+
+  getEthBalance(addr: PromiseOrValue<string>, overrides?: CallOverrides): Promise<BigNumber>
+
+  multicall(
+    calls: UniswapInterfaceMulticall.CallStruct[],
+    overrides?: Overrides & { from?: PromiseOrValue<string> }
+  ): Promise<ContractTransaction>
+
+  callStatic: {
+    getCurrentBlockTimestamp(overrides?: CallOverrides): Promise<BigNumber>
+
+    getEthBalance(addr: PromiseOrValue<string>, overrides?: CallOverrides): Promise<BigNumber>
+
+    multicall(
+      calls: UniswapInterfaceMulticall.CallStruct[],
+      overrides?: CallOverrides
+    ): Promise<
+      [BigNumber, UniswapInterfaceMulticall.ResultStructOutput[]] & {
+        blockNumber: BigNumber
+        returnData: UniswapInterfaceMulticall.ResultStructOutput[]
+      }
+    >
+  }
+
+  filters: {}
+
+  estimateGas: {
+    getCurrentBlockTimestamp(overrides?: CallOverrides): Promise<BigNumber>
+
+    getEthBalance(addr: PromiseOrValue<string>, overrides?: CallOverrides): Promise<BigNumber>
+
+    multicall(
+      calls: UniswapInterfaceMulticall.CallStruct[],
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<BigNumber>
+  }
+
+  populateTransaction: {
+    getCurrentBlockTimestamp(overrides?: CallOverrides): Promise<PopulatedTransaction>
+
+    getEthBalance(addr: PromiseOrValue<string>, overrides?: CallOverrides): Promise<PopulatedTransaction>
+
+    multicall(
+      calls: UniswapInterfaceMulticall.CallStruct[],
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<PopulatedTransaction>
+  }
+}
diff --git a/src/libs/abis/src/generated/legacy/Weth.ts b/src/libs/abis/src/generated/legacy/Weth.ts
new file mode 100644
index 0000000000..ce274b6d12
--- /dev/null
+++ b/src/libs/abis/src/generated/legacy/Weth.ts
@@ -0,0 +1,373 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+import type {
+  BaseContract,
+  BigNumber,
+  BigNumberish,
+  BytesLike,
+  CallOverrides,
+  ContractTransaction,
+  Overrides,
+  PayableOverrides,
+  PopulatedTransaction,
+  Signer,
+  utils,
+} from 'ethers'
+import type { FunctionFragment, Result, EventFragment } from '@ethersproject/abi'
+import type { Listener, Provider } from '@ethersproject/providers'
+import type { TypedEventFilter, TypedEvent, TypedListener, OnEvent, PromiseOrValue } from './common'
+
+export interface WethInterface extends utils.Interface {
+  functions: {
+    'name()': FunctionFragment
+    'approve(address,uint256)': FunctionFragment
+    'totalSupply()': FunctionFragment
+    'transferFrom(address,address,uint256)': FunctionFragment
+    'withdraw(uint256)': FunctionFragment
+    'decimals()': FunctionFragment
+    'balanceOf(address)': FunctionFragment
+    'symbol()': FunctionFragment
+    'transfer(address,uint256)': FunctionFragment
+    'deposit()': FunctionFragment
+    'allowance(address,address)': FunctionFragment
+  }
+
+  getFunction(
+    nameOrSignatureOrTopic:
+      | 'name'
+      | 'approve'
+      | 'totalSupply'
+      | 'transferFrom'
+      | 'withdraw'
+      | 'decimals'
+      | 'balanceOf'
+      | 'symbol'
+      | 'transfer'
+      | 'deposit'
+      | 'allowance'
+  ): FunctionFragment
+
+  encodeFunctionData(functionFragment: 'name', values?: undefined): string
+  encodeFunctionData(
+    functionFragment: 'approve',
+    values: [PromiseOrValue<string>, PromiseOrValue<BigNumberish>]
+  ): string
+  encodeFunctionData(functionFragment: 'totalSupply', values?: undefined): string
+  encodeFunctionData(
+    functionFragment: 'transferFrom',
+    values: [PromiseOrValue<string>, PromiseOrValue<string>, PromiseOrValue<BigNumberish>]
+  ): string
+  encodeFunctionData(functionFragment: 'withdraw', values: [PromiseOrValue<BigNumberish>]): string
+  encodeFunctionData(functionFragment: 'decimals', values?: undefined): string
+  encodeFunctionData(functionFragment: 'balanceOf', values: [PromiseOrValue<string>]): string
+  encodeFunctionData(functionFragment: 'symbol', values?: undefined): string
+  encodeFunctionData(
+    functionFragment: 'transfer',
+    values: [PromiseOrValue<string>, PromiseOrValue<BigNumberish>]
+  ): string
+  encodeFunctionData(functionFragment: 'deposit', values?: undefined): string
+  encodeFunctionData(functionFragment: 'allowance', values: [PromiseOrValue<string>, PromiseOrValue<string>]): string
+
+  decodeFunctionResult(functionFragment: 'name', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'approve', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'totalSupply', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'transferFrom', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'withdraw', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'decimals', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'balanceOf', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'symbol', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'transfer', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'deposit', data: BytesLike): Result
+  decodeFunctionResult(functionFragment: 'allowance', data: BytesLike): Result
+
+  events: {
+    'Approval(address,address,uint256)': EventFragment
+    'Transfer(address,address,uint256)': EventFragment
+    'Deposit(address,uint256)': EventFragment
+    'Withdrawal(address,uint256)': EventFragment
+  }
+
+  getEvent(nameOrSignatureOrTopic: 'Approval'): EventFragment
+  getEvent(nameOrSignatureOrTopic: 'Transfer'): EventFragment
+  getEvent(nameOrSignatureOrTopic: 'Deposit'): EventFragment
+  getEvent(nameOrSignatureOrTopic: 'Withdrawal'): EventFragment
+}
+
+export interface ApprovalEventObject {
+  src: string
+  guy: string
+  wad: BigNumber
+}
+export type ApprovalEvent = TypedEvent<[string, string, BigNumber], ApprovalEventObject>
+
+export type ApprovalEventFilter = TypedEventFilter<ApprovalEvent>
+
+export interface TransferEventObject {
+  src: string
+  dst: string
+  wad: BigNumber
+}
+export type TransferEvent = TypedEvent<[string, string, BigNumber], TransferEventObject>
+
+export type TransferEventFilter = TypedEventFilter<TransferEvent>
+
+export interface DepositEventObject {
+  dst: string
+  wad: BigNumber
+}
+export type DepositEvent = TypedEvent<[string, BigNumber], DepositEventObject>
+
+export type DepositEventFilter = TypedEventFilter<DepositEvent>
+
+export interface WithdrawalEventObject {
+  src: string
+  wad: BigNumber
+}
+export type WithdrawalEvent = TypedEvent<[string, BigNumber], WithdrawalEventObject>
+
+export type WithdrawalEventFilter = TypedEventFilter<WithdrawalEvent>
+
+export interface Weth extends BaseContract {
+  connect(signerOrProvider: Signer | Provider | string): this
+  attach(addressOrName: string): this
+  deployed(): Promise<this>
+
+  interface: WethInterface
+
+  queryFilter<TEvent extends TypedEvent>(
+    event: TypedEventFilter<TEvent>,
+    fromBlockOrBlockhash?: string | number | undefined,
+    toBlock?: string | number | undefined
+  ): Promise<Array<TEvent>>
+
+  listeners<TEvent extends TypedEvent>(eventFilter?: TypedEventFilter<TEvent>): Array<TypedListener<TEvent>>
+  listeners(eventName?: string): Array<Listener>
+  removeAllListeners<TEvent extends TypedEvent>(eventFilter: TypedEventFilter<TEvent>): this
+  removeAllListeners(eventName?: string): this
+  off: OnEvent<this>
+  on: OnEvent<this>
+  once: OnEvent<this>
+  removeListener: OnEvent<this>
+
+  functions: {
+    name(overrides?: CallOverrides): Promise<[string]>
+
+    approve(
+      guy: PromiseOrValue<string>,
+      wad: PromiseOrValue<BigNumberish>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<ContractTransaction>
+
+    totalSupply(overrides?: CallOverrides): Promise<[BigNumber]>
+
+    transferFrom(
+      src: PromiseOrValue<string>,
+      dst: PromiseOrValue<string>,
+      wad: PromiseOrValue<BigNumberish>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<ContractTransaction>
+
+    withdraw(
+      wad: PromiseOrValue<BigNumberish>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<ContractTransaction>
+
+    decimals(overrides?: CallOverrides): Promise<[number]>
+
+    balanceOf(arg0: PromiseOrValue<string>, overrides?: CallOverrides): Promise<[BigNumber]>
+
+    symbol(overrides?: CallOverrides): Promise<[string]>
+
+    transfer(
+      dst: PromiseOrValue<string>,
+      wad: PromiseOrValue<BigNumberish>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<ContractTransaction>
+
+    deposit(overrides?: PayableOverrides & { from?: PromiseOrValue<string> }): Promise<ContractTransaction>
+
+    allowance(
+      arg0: PromiseOrValue<string>,
+      arg1: PromiseOrValue<string>,
+      overrides?: CallOverrides
+    ): Promise<[BigNumber]>
+  }
+
+  name(overrides?: CallOverrides): Promise<string>
+
+  approve(
+    guy: PromiseOrValue<string>,
+    wad: PromiseOrValue<BigNumberish>,
+    overrides?: Overrides & { from?: PromiseOrValue<string> }
+  ): Promise<ContractTransaction>
+
+  totalSupply(overrides?: CallOverrides): Promise<BigNumber>
+
+  transferFrom(
+    src: PromiseOrValue<string>,
+    dst: PromiseOrValue<string>,
+    wad: PromiseOrValue<BigNumberish>,
+    overrides?: Overrides & { from?: PromiseOrValue<string> }
+  ): Promise<ContractTransaction>
+
+  withdraw(
+    wad: PromiseOrValue<BigNumberish>,
+    overrides?: Overrides & { from?: PromiseOrValue<string> }
+  ): Promise<ContractTransaction>
+
+  decimals(overrides?: CallOverrides): Promise<number>
+
+  balanceOf(arg0: PromiseOrValue<string>, overrides?: CallOverrides): Promise<BigNumber>
+
+  symbol(overrides?: CallOverrides): Promise<string>
+
+  transfer(
+    dst: PromiseOrValue<string>,
+    wad: PromiseOrValue<BigNumberish>,
+    overrides?: Overrides & { from?: PromiseOrValue<string> }
+  ): Promise<ContractTransaction>
+
+  deposit(overrides?: PayableOverrides & { from?: PromiseOrValue<string> }): Promise<ContractTransaction>
+
+  allowance(arg0: PromiseOrValue<string>, arg1: PromiseOrValue<string>, overrides?: CallOverrides): Promise<BigNumber>
+
+  callStatic: {
+    name(overrides?: CallOverrides): Promise<string>
+
+    approve(guy: PromiseOrValue<string>, wad: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<boolean>
+
+    totalSupply(overrides?: CallOverrides): Promise<BigNumber>
+
+    transferFrom(
+      src: PromiseOrValue<string>,
+      dst: PromiseOrValue<string>,
+      wad: PromiseOrValue<BigNumberish>,
+      overrides?: CallOverrides
+    ): Promise<boolean>
+
+    withdraw(wad: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<void>
+
+    decimals(overrides?: CallOverrides): Promise<number>
+
+    balanceOf(arg0: PromiseOrValue<string>, overrides?: CallOverrides): Promise<BigNumber>
+
+    symbol(overrides?: CallOverrides): Promise<string>
+
+    transfer(
+      dst: PromiseOrValue<string>,
+      wad: PromiseOrValue<BigNumberish>,
+      overrides?: CallOverrides
+    ): Promise<boolean>
+
+    deposit(overrides?: CallOverrides): Promise<void>
+
+    allowance(arg0: PromiseOrValue<string>, arg1: PromiseOrValue<string>, overrides?: CallOverrides): Promise<BigNumber>
+  }
+
+  filters: {
+    'Approval(address,address,uint256)'(
+      src?: PromiseOrValue<string> | null,
+      guy?: PromiseOrValue<string> | null,
+      wad?: null
+    ): ApprovalEventFilter
+    Approval(src?: PromiseOrValue<string> | null, guy?: PromiseOrValue<string> | null, wad?: null): ApprovalEventFilter
+
+    'Transfer(address,address,uint256)'(
+      src?: PromiseOrValue<string> | null,
+      dst?: PromiseOrValue<string> | null,
+      wad?: null
+    ): TransferEventFilter
+    Transfer(src?: PromiseOrValue<string> | null, dst?: PromiseOrValue<string> | null, wad?: null): TransferEventFilter
+
+    'Deposit(address,uint256)'(dst?: PromiseOrValue<string> | null, wad?: null): DepositEventFilter
+    Deposit(dst?: PromiseOrValue<string> | null, wad?: null): DepositEventFilter
+
+    'Withdrawal(address,uint256)'(src?: PromiseOrValue<string> | null, wad?: null): WithdrawalEventFilter
+    Withdrawal(src?: PromiseOrValue<string> | null, wad?: null): WithdrawalEventFilter
+  }
+
+  estimateGas: {
+    name(overrides?: CallOverrides): Promise<BigNumber>
+
+    approve(
+      guy: PromiseOrValue<string>,
+      wad: PromiseOrValue<BigNumberish>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<BigNumber>
+
+    totalSupply(overrides?: CallOverrides): Promise<BigNumber>
+
+    transferFrom(
+      src: PromiseOrValue<string>,
+      dst: PromiseOrValue<string>,
+      wad: PromiseOrValue<BigNumberish>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<BigNumber>
+
+    withdraw(
+      wad: PromiseOrValue<BigNumberish>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<BigNumber>
+
+    decimals(overrides?: CallOverrides): Promise<BigNumber>
+
+    balanceOf(arg0: PromiseOrValue<string>, overrides?: CallOverrides): Promise<BigNumber>
+
+    symbol(overrides?: CallOverrides): Promise<BigNumber>
+
+    transfer(
+      dst: PromiseOrValue<string>,
+      wad: PromiseOrValue<BigNumberish>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<BigNumber>
+
+    deposit(overrides?: PayableOverrides & { from?: PromiseOrValue<string> }): Promise<BigNumber>
+
+    allowance(arg0: PromiseOrValue<string>, arg1: PromiseOrValue<string>, overrides?: CallOverrides): Promise<BigNumber>
+  }
+
+  populateTransaction: {
+    name(overrides?: CallOverrides): Promise<PopulatedTransaction>
+
+    approve(
+      guy: PromiseOrValue<string>,
+      wad: PromiseOrValue<BigNumberish>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<PopulatedTransaction>
+
+    totalSupply(overrides?: CallOverrides): Promise<PopulatedTransaction>
+
+    transferFrom(
+      src: PromiseOrValue<string>,
+      dst: PromiseOrValue<string>,
+      wad: PromiseOrValue<BigNumberish>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<PopulatedTransaction>
+
+    withdraw(
+      wad: PromiseOrValue<BigNumberish>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<PopulatedTransaction>
+
+    decimals(overrides?: CallOverrides): Promise<PopulatedTransaction>
+
+    balanceOf(arg0: PromiseOrValue<string>, overrides?: CallOverrides): Promise<PopulatedTransaction>
+
+    symbol(overrides?: CallOverrides): Promise<PopulatedTransaction>
+
+    transfer(
+      dst: PromiseOrValue<string>,
+      wad: PromiseOrValue<BigNumberish>,
+      overrides?: Overrides & { from?: PromiseOrValue<string> }
+    ): Promise<PopulatedTransaction>
+
+    deposit(overrides?: PayableOverrides & { from?: PromiseOrValue<string> }): Promise<PopulatedTransaction>
+
+    allowance(
+      arg0: PromiseOrValue<string>,
+      arg1: PromiseOrValue<string>,
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>
+  }
+}
diff --git a/src/libs/abis/src/generated/legacy/common.ts b/src/libs/abis/src/generated/legacy/common.ts
new file mode 100644
index 0000000000..5d37e711b7
--- /dev/null
+++ b/src/libs/abis/src/generated/legacy/common.ts
@@ -0,0 +1,32 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+import type { Listener } from '@ethersproject/providers'
+import type { Event, EventFilter } from 'ethers'
+
+export interface TypedEvent<TArgsArray extends Array<any> = any, TArgsObject = any> extends Event {
+  args: TArgsArray & TArgsObject
+}
+
+export interface TypedEventFilter<_TEvent extends TypedEvent> extends EventFilter {}
+
+export interface TypedListener<TEvent extends TypedEvent> {
+  (...listenerArg: [...__TypechainArgsArray<TEvent>, TEvent]): void
+}
+
+type __TypechainArgsArray<T> = T extends TypedEvent<infer U> ? U : never
+
+export interface OnEvent<TRes> {
+  <TEvent extends TypedEvent>(eventFilter: TypedEventFilter<TEvent>, listener: TypedListener<TEvent>): TRes
+  (eventName: string, listener: Listener): TRes
+}
+
+export type MinEthersFactory<C, ARGS> = {
+  deploy(...a: ARGS[]): Promise<C>
+}
+
+export type GetContractTypeFromFactory<F> = F extends MinEthersFactory<infer C, any> ? C : never
+
+export type GetARGsTypeFromFactory<F> = F extends MinEthersFactory<any, any> ? Parameters<F['deploy']> : never
+
+export type PromiseOrValue<T> = T | Promise<T>
diff --git a/src/libs/abis/src/generated/legacy/factories/ArgentWalletContract__factory.ts b/src/libs/abis/src/generated/legacy/factories/ArgentWalletContract__factory.ts
new file mode 100644
index 0000000000..28b78d1062
--- /dev/null
+++ b/src/libs/abis/src/generated/legacy/factories/ArgentWalletContract__factory.ts
@@ -0,0 +1,79 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+
+import { Contract, Signer, utils } from 'ethers'
+import type { Provider } from '@ethersproject/providers'
+import type { ArgentWalletContract, ArgentWalletContractInterface } from '../ArgentWalletContract'
+
+const _abi = [
+  {
+    inputs: [
+      {
+        components: [
+          {
+            internalType: 'address',
+            name: 'to',
+            type: 'address',
+          },
+          {
+            internalType: 'uint256',
+            name: 'value',
+            type: 'uint256',
+          },
+          {
+            internalType: 'bytes',
+            name: 'data',
+            type: 'bytes',
+          },
+        ],
+        name: '_transactions',
+        type: 'tuple[]',
+      },
+    ],
+    name: 'wc_multiCall',
+    outputs: [
+      {
+        internalType: 'bytes[]',
+        name: '',
+        type: 'bytes[]',
+      },
+    ],
+    stateMutability: 'nonpayable',
+    type: 'function',
+  },
+  {
+    inputs: [
+      {
+        internalType: 'bytes32',
+        name: '_msgHash',
+        type: 'bytes32',
+      },
+      {
+        internalType: 'bytes',
+        name: '_signature',
+        type: 'bytes',
+      },
+    ],
+    name: 'isValidSignature',
+    outputs: [
+      {
+        internalType: 'bytes4',
+        name: '',
+        type: 'bytes4',
+      },
+    ],
+    stateMutability: 'view',
+    type: 'function',
+  },
+] as const
+
+export class ArgentWalletContract__factory {
+  static readonly abi = _abi
+  static createInterface(): ArgentWalletContractInterface {
+    return new utils.Interface(_abi) as ArgentWalletContractInterface
+  }
+  static connect(address: string, signerOrProvider: Signer | Provider): ArgentWalletContract {
+    return new Contract(address, _abi, signerOrProvider) as ArgentWalletContract
+  }
+}
diff --git a/src/libs/abis/src/generated/legacy/factories/ArgentWalletDetector__factory.ts b/src/libs/abis/src/generated/legacy/factories/ArgentWalletDetector__factory.ts
new file mode 100644
index 0000000000..323ffb6f29
--- /dev/null
+++ b/src/libs/abis/src/generated/legacy/factories/ArgentWalletDetector__factory.ts
@@ -0,0 +1,233 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+
+import { Contract, Signer, utils } from 'ethers'
+import type { Provider } from '@ethersproject/providers'
+import type { ArgentWalletDetector, ArgentWalletDetectorInterface } from '../ArgentWalletDetector'
+
+const _abi = [
+  {
+    inputs: [
+      {
+        internalType: 'bytes32[]',
+        name: '_codes',
+        type: 'bytes32[]',
+      },
+      {
+        internalType: 'address[]',
+        name: '_implementations',
+        type: 'address[]',
+      },
+    ],
+    stateMutability: 'nonpayable',
+    type: 'constructor',
+  },
+  {
+    anonymous: false,
+    inputs: [
+      {
+        indexed: true,
+        internalType: 'bytes32',
+        name: 'code',
+        type: 'bytes32',
+      },
+    ],
+    name: 'CodeAdded',
+    type: 'event',
+  },
+  {
+    anonymous: false,
+    inputs: [
+      {
+        indexed: true,
+        internalType: 'address',
+        name: 'implementation',
+        type: 'address',
+      },
+    ],
+    name: 'ImplementationAdded',
+    type: 'event',
+  },
+  {
+    anonymous: false,
+    inputs: [
+      {
+        indexed: true,
+        internalType: 'address',
+        name: '_newOwner',
+        type: 'address',
+      },
+    ],
+    name: 'OwnerChanged',
+    type: 'event',
+  },
+  {
+    inputs: [
+      {
+        internalType: 'bytes32',
+        name: '',
+        type: 'bytes32',
+      },
+    ],
+    name: 'acceptedCodes',
+    outputs: [
+      {
+        internalType: 'bool',
+        name: 'exists',
+        type: 'bool',
+      },
+      {
+        internalType: 'uint128',
+        name: 'index',
+        type: 'uint128',
+      },
+    ],
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    inputs: [
+      {
+        internalType: 'address',
+        name: '',
+        type: 'address',
+      },
+    ],
+    name: 'acceptedImplementations',
+    outputs: [
+      {
+        internalType: 'bool',
+        name: 'exists',
+        type: 'bool',
+      },
+      {
+        internalType: 'uint128',
+        name: 'index',
+        type: 'uint128',
+      },
+    ],
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    inputs: [
+      {
+        internalType: 'bytes32',
+        name: '_code',
+        type: 'bytes32',
+      },
+    ],
+    name: 'addCode',
+    outputs: [],
+    stateMutability: 'nonpayable',
+    type: 'function',
+  },
+  {
+    inputs: [
+      {
+        internalType: 'address',
+        name: '_argentWallet',
+        type: 'address',
+      },
+    ],
+    name: 'addCodeAndImplementationFromWallet',
+    outputs: [],
+    stateMutability: 'nonpayable',
+    type: 'function',
+  },
+  {
+    inputs: [
+      {
+        internalType: 'address',
+        name: '_impl',
+        type: 'address',
+      },
+    ],
+    name: 'addImplementation',
+    outputs: [],
+    stateMutability: 'nonpayable',
+    type: 'function',
+  },
+  {
+    inputs: [
+      {
+        internalType: 'address',
+        name: '_newOwner',
+        type: 'address',
+      },
+    ],
+    name: 'changeOwner',
+    outputs: [],
+    stateMutability: 'nonpayable',
+    type: 'function',
+  },
+  {
+    inputs: [],
+    name: 'getCodes',
+    outputs: [
+      {
+        internalType: 'bytes32[]',
+        name: '',
+        type: 'bytes32[]',
+      },
+    ],
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    inputs: [],
+    name: 'getImplementations',
+    outputs: [
+      {
+        internalType: 'address[]',
+        name: '',
+        type: 'address[]',
+      },
+    ],
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    inputs: [
+      {
+        internalType: 'address',
+        name: '_wallet',
+        type: 'address',
+      },
+    ],
+    name: 'isArgentWallet',
+    outputs: [
+      {
+        internalType: 'bool',
+        name: '',
+        type: 'bool',
+      },
+    ],
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    inputs: [],
+    name: 'owner',
+    outputs: [
+      {
+        internalType: 'address',
+        name: '',
+        type: 'address',
+      },
+    ],
+    stateMutability: 'view',
+    type: 'function',
+  },
+] as const
+
+export class ArgentWalletDetector__factory {
+  static readonly abi = _abi
+  static createInterface(): ArgentWalletDetectorInterface {
+    return new utils.Interface(_abi) as ArgentWalletDetectorInterface
+  }
+  static connect(address: string, signerOrProvider: Signer | Provider): ArgentWalletDetector {
+    return new Contract(address, _abi, signerOrProvider) as ArgentWalletDetector
+  }
+}
diff --git a/src/libs/abis/src/generated/legacy/factories/Eip_2612__factory.ts b/src/libs/abis/src/generated/legacy/factories/Eip_2612__factory.ts
new file mode 100644
index 0000000000..f222e547b5
--- /dev/null
+++ b/src/libs/abis/src/generated/legacy/factories/Eip_2612__factory.ts
@@ -0,0 +1,53 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+
+import { Contract, Signer, utils } from 'ethers'
+import type { Provider } from '@ethersproject/providers'
+import type { Eip_2612, Eip_2612Interface } from '../Eip_2612'
+
+const _abi = [
+  {
+    constant: true,
+    inputs: [
+      {
+        name: 'owner',
+        type: 'address',
+      },
+    ],
+    name: 'nonces',
+    outputs: [
+      {
+        name: '',
+        type: 'uint256',
+      },
+    ],
+    payable: false,
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    constant: true,
+    inputs: [],
+    name: 'DOMAIN_SEPARATOR',
+    outputs: [
+      {
+        name: '',
+        type: 'bytes32',
+      },
+    ],
+    payable: false,
+    stateMutability: 'view',
+    type: 'function',
+  },
+] as const
+
+export class Eip_2612__factory {
+  static readonly abi = _abi
+  static createInterface(): Eip_2612Interface {
+    return new utils.Interface(_abi) as Eip_2612Interface
+  }
+  static connect(address: string, signerOrProvider: Signer | Provider): Eip_2612 {
+    return new Contract(address, _abi, signerOrProvider) as Eip_2612
+  }
+}
diff --git a/src/libs/abis/src/generated/legacy/factories/EnsPublicResolver__factory.ts b/src/libs/abis/src/generated/legacy/factories/EnsPublicResolver__factory.ts
new file mode 100644
index 0000000000..16a7e31edf
--- /dev/null
+++ b/src/libs/abis/src/generated/legacy/factories/EnsPublicResolver__factory.ts
@@ -0,0 +1,834 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+
+import { Contract, Signer, utils } from 'ethers'
+import type { Provider } from '@ethersproject/providers'
+import type { EnsPublicResolver, EnsPublicResolverInterface } from '../EnsPublicResolver'
+
+const _abi = [
+  {
+    inputs: [
+      {
+        internalType: 'contract ENS',
+        name: '_ens',
+        type: 'address',
+      },
+    ],
+    payable: false,
+    stateMutability: 'nonpayable',
+    type: 'constructor',
+  },
+  {
+    anonymous: false,
+    inputs: [
+      {
+        indexed: true,
+        internalType: 'bytes32',
+        name: 'node',
+        type: 'bytes32',
+      },
+      {
+        indexed: true,
+        internalType: 'uint256',
+        name: 'contentType',
+        type: 'uint256',
+      },
+    ],
+    name: 'ABIChanged',
+    type: 'event',
+  },
+  {
+    anonymous: false,
+    inputs: [
+      {
+        indexed: true,
+        internalType: 'bytes32',
+        name: 'node',
+        type: 'bytes32',
+      },
+      {
+        indexed: false,
+        internalType: 'address',
+        name: 'a',
+        type: 'address',
+      },
+    ],
+    name: 'AddrChanged',
+    type: 'event',
+  },
+  {
+    anonymous: false,
+    inputs: [
+      {
+        indexed: true,
+        internalType: 'bytes32',
+        name: 'node',
+        type: 'bytes32',
+      },
+      {
+        indexed: false,
+        internalType: 'uint256',
+        name: 'coinType',
+        type: 'uint256',
+      },
+      {
+        indexed: false,
+        internalType: 'bytes',
+        name: 'newAddress',
+        type: 'bytes',
+      },
+    ],
+    name: 'AddressChanged',
+    type: 'event',
+  },
+  {
+    anonymous: false,
+    inputs: [
+      {
+        indexed: true,
+        internalType: 'bytes32',
+        name: 'node',
+        type: 'bytes32',
+      },
+      {
+        indexed: true,
+        internalType: 'address',
+        name: 'owner',
+        type: 'address',
+      },
+      {
+        indexed: true,
+        internalType: 'address',
+        name: 'target',
+        type: 'address',
+      },
+      {
+        indexed: false,
+        internalType: 'bool',
+        name: 'isAuthorised',
+        type: 'bool',
+      },
+    ],
+    name: 'AuthorisationChanged',
+    type: 'event',
+  },
+  {
+    anonymous: false,
+    inputs: [
+      {
+        indexed: true,
+        internalType: 'bytes32',
+        name: 'node',
+        type: 'bytes32',
+      },
+      {
+        indexed: false,
+        internalType: 'bytes',
+        name: 'hash',
+        type: 'bytes',
+      },
+    ],
+    name: 'ContenthashChanged',
+    type: 'event',
+  },
+  {
+    anonymous: false,
+    inputs: [
+      {
+        indexed: true,
+        internalType: 'bytes32',
+        name: 'node',
+        type: 'bytes32',
+      },
+      {
+        indexed: false,
+        internalType: 'bytes',
+        name: 'name',
+        type: 'bytes',
+      },
+      {
+        indexed: false,
+        internalType: 'uint16',
+        name: 'resource',
+        type: 'uint16',
+      },
+      {
+        indexed: false,
+        internalType: 'bytes',
+        name: 'record',
+        type: 'bytes',
+      },
+    ],
+    name: 'DNSRecordChanged',
+    type: 'event',
+  },
+  {
+    anonymous: false,
+    inputs: [
+      {
+        indexed: true,
+        internalType: 'bytes32',
+        name: 'node',
+        type: 'bytes32',
+      },
+      {
+        indexed: false,
+        internalType: 'bytes',
+        name: 'name',
+        type: 'bytes',
+      },
+      {
+        indexed: false,
+        internalType: 'uint16',
+        name: 'resource',
+        type: 'uint16',
+      },
+    ],
+    name: 'DNSRecordDeleted',
+    type: 'event',
+  },
+  {
+    anonymous: false,
+    inputs: [
+      {
+        indexed: true,
+        internalType: 'bytes32',
+        name: 'node',
+        type: 'bytes32',
+      },
+    ],
+    name: 'DNSZoneCleared',
+    type: 'event',
+  },
+  {
+    anonymous: false,
+    inputs: [
+      {
+        indexed: true,
+        internalType: 'bytes32',
+        name: 'node',
+        type: 'bytes32',
+      },
+      {
+        indexed: true,
+        internalType: 'bytes4',
+        name: 'interfaceID',
+        type: 'bytes4',
+      },
+      {
+        indexed: false,
+        internalType: 'address',
+        name: 'implementer',
+        type: 'address',
+      },
+    ],
+    name: 'InterfaceChanged',
+    type: 'event',
+  },
+  {
+    anonymous: false,
+    inputs: [
+      {
+        indexed: true,
+        internalType: 'bytes32',
+        name: 'node',
+        type: 'bytes32',
+      },
+      {
+        indexed: false,
+        internalType: 'string',
+        name: 'name',
+        type: 'string',
+      },
+    ],
+    name: 'NameChanged',
+    type: 'event',
+  },
+  {
+    anonymous: false,
+    inputs: [
+      {
+        indexed: true,
+        internalType: 'bytes32',
+        name: 'node',
+        type: 'bytes32',
+      },
+      {
+        indexed: false,
+        internalType: 'bytes32',
+        name: 'x',
+        type: 'bytes32',
+      },
+      {
+        indexed: false,
+        internalType: 'bytes32',
+        name: 'y',
+        type: 'bytes32',
+      },
+    ],
+    name: 'PubkeyChanged',
+    type: 'event',
+  },
+  {
+    anonymous: false,
+    inputs: [
+      {
+        indexed: true,
+        internalType: 'bytes32',
+        name: 'node',
+        type: 'bytes32',
+      },
+      {
+        indexed: true,
+        internalType: 'string',
+        name: 'indexedKey',
+        type: 'string',
+      },
+      {
+        indexed: false,
+        internalType: 'string',
+        name: 'key',
+        type: 'string',
+      },
+    ],
+    name: 'TextChanged',
+    type: 'event',
+  },
+  {
+    constant: true,
+    inputs: [
+      {
+        internalType: 'bytes32',
+        name: 'node',
+        type: 'bytes32',
+      },
+      {
+        internalType: 'uint256',
+        name: 'contentTypes',
+        type: 'uint256',
+      },
+    ],
+    name: 'ABI',
+    outputs: [
+      {
+        internalType: 'uint256',
+        name: '',
+        type: 'uint256',
+      },
+      {
+        internalType: 'bytes',
+        name: '',
+        type: 'bytes',
+      },
+    ],
+    payable: false,
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    constant: true,
+    inputs: [
+      {
+        internalType: 'bytes32',
+        name: 'node',
+        type: 'bytes32',
+      },
+    ],
+    name: 'addr',
+    outputs: [
+      {
+        internalType: 'address payable',
+        name: '',
+        type: 'address',
+      },
+    ],
+    payable: false,
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    constant: true,
+    inputs: [
+      {
+        internalType: 'bytes32',
+        name: '',
+        type: 'bytes32',
+      },
+      {
+        internalType: 'address',
+        name: '',
+        type: 'address',
+      },
+      {
+        internalType: 'address',
+        name: '',
+        type: 'address',
+      },
+    ],
+    name: 'authorisations',
+    outputs: [
+      {
+        internalType: 'bool',
+        name: '',
+        type: 'bool',
+      },
+    ],
+    payable: false,
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    constant: false,
+    inputs: [
+      {
+        internalType: 'bytes32',
+        name: 'node',
+        type: 'bytes32',
+      },
+    ],
+    name: 'clearDNSZone',
+    outputs: [],
+    payable: false,
+    stateMutability: 'nonpayable',
+    type: 'function',
+  },
+  {
+    constant: true,
+    inputs: [
+      {
+        internalType: 'bytes32',
+        name: 'node',
+        type: 'bytes32',
+      },
+    ],
+    name: 'contenthash',
+    outputs: [
+      {
+        internalType: 'bytes',
+        name: '',
+        type: 'bytes',
+      },
+    ],
+    payable: false,
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    constant: true,
+    inputs: [
+      {
+        internalType: 'bytes32',
+        name: 'node',
+        type: 'bytes32',
+      },
+      {
+        internalType: 'bytes32',
+        name: 'name',
+        type: 'bytes32',
+      },
+      {
+        internalType: 'uint16',
+        name: 'resource',
+        type: 'uint16',
+      },
+    ],
+    name: 'dnsRecord',
+    outputs: [
+      {
+        internalType: 'bytes',
+        name: '',
+        type: 'bytes',
+      },
+    ],
+    payable: false,
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    constant: true,
+    inputs: [
+      {
+        internalType: 'bytes32',
+        name: 'node',
+        type: 'bytes32',
+      },
+      {
+        internalType: 'bytes32',
+        name: 'name',
+        type: 'bytes32',
+      },
+    ],
+    name: 'hasDNSRecords',
+    outputs: [
+      {
+        internalType: 'bool',
+        name: '',
+        type: 'bool',
+      },
+    ],
+    payable: false,
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    constant: true,
+    inputs: [
+      {
+        internalType: 'bytes32',
+        name: 'node',
+        type: 'bytes32',
+      },
+      {
+        internalType: 'bytes4',
+        name: 'interfaceID',
+        type: 'bytes4',
+      },
+    ],
+    name: 'interfaceImplementer',
+    outputs: [
+      {
+        internalType: 'address',
+        name: '',
+        type: 'address',
+      },
+    ],
+    payable: false,
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    constant: true,
+    inputs: [
+      {
+        internalType: 'bytes32',
+        name: 'node',
+        type: 'bytes32',
+      },
+    ],
+    name: 'name',
+    outputs: [
+      {
+        internalType: 'string',
+        name: '',
+        type: 'string',
+      },
+    ],
+    payable: false,
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    constant: true,
+    inputs: [
+      {
+        internalType: 'bytes32',
+        name: 'node',
+        type: 'bytes32',
+      },
+    ],
+    name: 'pubkey',
+    outputs: [
+      {
+        internalType: 'bytes32',
+        name: 'x',
+        type: 'bytes32',
+      },
+      {
+        internalType: 'bytes32',
+        name: 'y',
+        type: 'bytes32',
+      },
+    ],
+    payable: false,
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    constant: false,
+    inputs: [
+      {
+        internalType: 'bytes32',
+        name: 'node',
+        type: 'bytes32',
+      },
+      {
+        internalType: 'uint256',
+        name: 'contentType',
+        type: 'uint256',
+      },
+      {
+        internalType: 'bytes',
+        name: 'data',
+        type: 'bytes',
+      },
+    ],
+    name: 'setABI',
+    outputs: [],
+    payable: false,
+    stateMutability: 'nonpayable',
+    type: 'function',
+  },
+  {
+    constant: false,
+    inputs: [
+      {
+        internalType: 'bytes32',
+        name: 'node',
+        type: 'bytes32',
+      },
+      {
+        internalType: 'uint256',
+        name: 'coinType',
+        type: 'uint256',
+      },
+      {
+        internalType: 'bytes',
+        name: 'a',
+        type: 'bytes',
+      },
+    ],
+    name: 'setAddr',
+    outputs: [],
+    payable: false,
+    stateMutability: 'nonpayable',
+    type: 'function',
+  },
+  {
+    constant: false,
+    inputs: [
+      {
+        internalType: 'bytes32',
+        name: 'node',
+        type: 'bytes32',
+      },
+      {
+        internalType: 'address',
+        name: 'a',
+        type: 'address',
+      },
+    ],
+    name: 'setAddr',
+    outputs: [],
+    payable: false,
+    stateMutability: 'nonpayable',
+    type: 'function',
+  },
+  {
+    constant: false,
+    inputs: [
+      {
+        internalType: 'bytes32',
+        name: 'node',
+        type: 'bytes32',
+      },
+      {
+        internalType: 'address',
+        name: 'target',
+        type: 'address',
+      },
+      {
+        internalType: 'bool',
+        name: 'isAuthorised',
+        type: 'bool',
+      },
+    ],
+    name: 'setAuthorisation',
+    outputs: [],
+    payable: false,
+    stateMutability: 'nonpayable',
+    type: 'function',
+  },
+  {
+    constant: false,
+    inputs: [
+      {
+        internalType: 'bytes32',
+        name: 'node',
+        type: 'bytes32',
+      },
+      {
+        internalType: 'bytes',
+        name: 'hash',
+        type: 'bytes',
+      },
+    ],
+    name: 'setContenthash',
+    outputs: [],
+    payable: false,
+    stateMutability: 'nonpayable',
+    type: 'function',
+  },
+  {
+    constant: false,
+    inputs: [
+      {
+        internalType: 'bytes32',
+        name: 'node',
+        type: 'bytes32',
+      },
+      {
+        internalType: 'bytes',
+        name: 'data',
+        type: 'bytes',
+      },
+    ],
+    name: 'setDNSRecords',
+    outputs: [],
+    payable: false,
+    stateMutability: 'nonpayable',
+    type: 'function',
+  },
+  {
+    constant: false,
+    inputs: [
+      {
+        internalType: 'bytes32',
+        name: 'node',
+        type: 'bytes32',
+      },
+      {
+        internalType: 'bytes4',
+        name: 'interfaceID',
+        type: 'bytes4',
+      },
+      {
+        internalType: 'address',
+        name: 'implementer',
+        type: 'address',
+      },
+    ],
+    name: 'setInterface',
+    outputs: [],
+    payable: false,
+    stateMutability: 'nonpayable',
+    type: 'function',
+  },
+  {
+    constant: false,
+    inputs: [
+      {
+        internalType: 'bytes32',
+        name: 'node',
+        type: 'bytes32',
+      },
+      {
+        internalType: 'string',
+        name: 'name',
+        type: 'string',
+      },
+    ],
+    name: 'setName',
+    outputs: [],
+    payable: false,
+    stateMutability: 'nonpayable',
+    type: 'function',
+  },
+  {
+    constant: false,
+    inputs: [
+      {
+        internalType: 'bytes32',
+        name: 'node',
+        type: 'bytes32',
+      },
+      {
+        internalType: 'bytes32',
+        name: 'x',
+        type: 'bytes32',
+      },
+      {
+        internalType: 'bytes32',
+        name: 'y',
+        type: 'bytes32',
+      },
+    ],
+    name: 'setPubkey',
+    outputs: [],
+    payable: false,
+    stateMutability: 'nonpayable',
+    type: 'function',
+  },
+  {
+    constant: false,
+    inputs: [
+      {
+        internalType: 'bytes32',
+        name: 'node',
+        type: 'bytes32',
+      },
+      {
+        internalType: 'string',
+        name: 'key',
+        type: 'string',
+      },
+      {
+        internalType: 'string',
+        name: 'value',
+        type: 'string',
+      },
+    ],
+    name: 'setText',
+    outputs: [],
+    payable: false,
+    stateMutability: 'nonpayable',
+    type: 'function',
+  },
+  {
+    constant: true,
+    inputs: [
+      {
+        internalType: 'bytes4',
+        name: 'interfaceID',
+        type: 'bytes4',
+      },
+    ],
+    name: 'supportsInterface',
+    outputs: [
+      {
+        internalType: 'bool',
+        name: '',
+        type: 'bool',
+      },
+    ],
+    payable: false,
+    stateMutability: 'pure',
+    type: 'function',
+  },
+  {
+    constant: true,
+    inputs: [
+      {
+        internalType: 'bytes32',
+        name: 'node',
+        type: 'bytes32',
+      },
+      {
+        internalType: 'string',
+        name: 'key',
+        type: 'string',
+      },
+    ],
+    name: 'text',
+    outputs: [
+      {
+        internalType: 'string',
+        name: '',
+        type: 'string',
+      },
+    ],
+    payable: false,
+    stateMutability: 'view',
+    type: 'function',
+  },
+] as const
+
+export class EnsPublicResolver__factory {
+  static readonly abi = _abi
+  static createInterface(): EnsPublicResolverInterface {
+    return new utils.Interface(_abi) as EnsPublicResolverInterface
+  }
+  static connect(address: string, signerOrProvider: Signer | Provider): EnsPublicResolver {
+    return new Contract(address, _abi, signerOrProvider) as EnsPublicResolver
+  }
+}
diff --git a/src/libs/abis/src/generated/legacy/factories/EnsRegistrar__factory.ts b/src/libs/abis/src/generated/legacy/factories/EnsRegistrar__factory.ts
new file mode 100644
index 0000000000..f22518315b
--- /dev/null
+++ b/src/libs/abis/src/generated/legacy/factories/EnsRegistrar__factory.ts
@@ -0,0 +1,440 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+
+import { Contract, Signer, utils } from 'ethers'
+import type { Provider } from '@ethersproject/providers'
+import type { EnsRegistrar, EnsRegistrarInterface } from '../EnsRegistrar'
+
+const _abi = [
+  {
+    inputs: [
+      {
+        internalType: 'contract ENS',
+        name: '_old',
+        type: 'address',
+      },
+    ],
+    payable: false,
+    stateMutability: 'nonpayable',
+    type: 'constructor',
+  },
+  {
+    anonymous: false,
+    inputs: [
+      {
+        indexed: true,
+        internalType: 'address',
+        name: 'owner',
+        type: 'address',
+      },
+      {
+        indexed: true,
+        internalType: 'address',
+        name: 'operator',
+        type: 'address',
+      },
+      {
+        indexed: false,
+        internalType: 'bool',
+        name: 'approved',
+        type: 'bool',
+      },
+    ],
+    name: 'ApprovalForAll',
+    type: 'event',
+  },
+  {
+    anonymous: false,
+    inputs: [
+      {
+        indexed: true,
+        internalType: 'bytes32',
+        name: 'node',
+        type: 'bytes32',
+      },
+      {
+        indexed: true,
+        internalType: 'bytes32',
+        name: 'label',
+        type: 'bytes32',
+      },
+      {
+        indexed: false,
+        internalType: 'address',
+        name: 'owner',
+        type: 'address',
+      },
+    ],
+    name: 'NewOwner',
+    type: 'event',
+  },
+  {
+    anonymous: false,
+    inputs: [
+      {
+        indexed: true,
+        internalType: 'bytes32',
+        name: 'node',
+        type: 'bytes32',
+      },
+      {
+        indexed: false,
+        internalType: 'address',
+        name: 'resolver',
+        type: 'address',
+      },
+    ],
+    name: 'NewResolver',
+    type: 'event',
+  },
+  {
+    anonymous: false,
+    inputs: [
+      {
+        indexed: true,
+        internalType: 'bytes32',
+        name: 'node',
+        type: 'bytes32',
+      },
+      {
+        indexed: false,
+        internalType: 'uint64',
+        name: 'ttl',
+        type: 'uint64',
+      },
+    ],
+    name: 'NewTTL',
+    type: 'event',
+  },
+  {
+    anonymous: false,
+    inputs: [
+      {
+        indexed: true,
+        internalType: 'bytes32',
+        name: 'node',
+        type: 'bytes32',
+      },
+      {
+        indexed: false,
+        internalType: 'address',
+        name: 'owner',
+        type: 'address',
+      },
+    ],
+    name: 'Transfer',
+    type: 'event',
+  },
+  {
+    constant: true,
+    inputs: [
+      {
+        internalType: 'address',
+        name: 'owner',
+        type: 'address',
+      },
+      {
+        internalType: 'address',
+        name: 'operator',
+        type: 'address',
+      },
+    ],
+    name: 'isApprovedForAll',
+    outputs: [
+      {
+        internalType: 'bool',
+        name: '',
+        type: 'bool',
+      },
+    ],
+    payable: false,
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    constant: true,
+    inputs: [],
+    name: 'old',
+    outputs: [
+      {
+        internalType: 'contract ENS',
+        name: '',
+        type: 'address',
+      },
+    ],
+    payable: false,
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    constant: true,
+    inputs: [
+      {
+        internalType: 'bytes32',
+        name: 'node',
+        type: 'bytes32',
+      },
+    ],
+    name: 'owner',
+    outputs: [
+      {
+        internalType: 'address',
+        name: '',
+        type: 'address',
+      },
+    ],
+    payable: false,
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    constant: true,
+    inputs: [
+      {
+        internalType: 'bytes32',
+        name: 'node',
+        type: 'bytes32',
+      },
+    ],
+    name: 'recordExists',
+    outputs: [
+      {
+        internalType: 'bool',
+        name: '',
+        type: 'bool',
+      },
+    ],
+    payable: false,
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    constant: true,
+    inputs: [
+      {
+        internalType: 'bytes32',
+        name: 'node',
+        type: 'bytes32',
+      },
+    ],
+    name: 'resolver',
+    outputs: [
+      {
+        internalType: 'address',
+        name: '',
+        type: 'address',
+      },
+    ],
+    payable: false,
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    constant: false,
+    inputs: [
+      {
+        internalType: 'address',
+        name: 'operator',
+        type: 'address',
+      },
+      {
+        internalType: 'bool',
+        name: 'approved',
+        type: 'bool',
+      },
+    ],
+    name: 'setApprovalForAll',
+    outputs: [],
+    payable: false,
+    stateMutability: 'nonpayable',
+    type: 'function',
+  },
+  {
+    constant: false,
+    inputs: [
+      {
+        internalType: 'bytes32',
+        name: 'node',
+        type: 'bytes32',
+      },
+      {
+        internalType: 'address',
+        name: 'owner',
+        type: 'address',
+      },
+    ],
+    name: 'setOwner',
+    outputs: [],
+    payable: false,
+    stateMutability: 'nonpayable',
+    type: 'function',
+  },
+  {
+    constant: false,
+    inputs: [
+      {
+        internalType: 'bytes32',
+        name: 'node',
+        type: 'bytes32',
+      },
+      {
+        internalType: 'address',
+        name: 'owner',
+        type: 'address',
+      },
+      {
+        internalType: 'address',
+        name: 'resolver',
+        type: 'address',
+      },
+      {
+        internalType: 'uint64',
+        name: 'ttl',
+        type: 'uint64',
+      },
+    ],
+    name: 'setRecord',
+    outputs: [],
+    payable: false,
+    stateMutability: 'nonpayable',
+    type: 'function',
+  },
+  {
+    constant: false,
+    inputs: [
+      {
+        internalType: 'bytes32',
+        name: 'node',
+        type: 'bytes32',
+      },
+      {
+        internalType: 'address',
+        name: 'resolver',
+        type: 'address',
+      },
+    ],
+    name: 'setResolver',
+    outputs: [],
+    payable: false,
+    stateMutability: 'nonpayable',
+    type: 'function',
+  },
+  {
+    constant: false,
+    inputs: [
+      {
+        internalType: 'bytes32',
+        name: 'node',
+        type: 'bytes32',
+      },
+      {
+        internalType: 'bytes32',
+        name: 'label',
+        type: 'bytes32',
+      },
+      {
+        internalType: 'address',
+        name: 'owner',
+        type: 'address',
+      },
+    ],
+    name: 'setSubnodeOwner',
+    outputs: [
+      {
+        internalType: 'bytes32',
+        name: '',
+        type: 'bytes32',
+      },
+    ],
+    payable: false,
+    stateMutability: 'nonpayable',
+    type: 'function',
+  },
+  {
+    constant: false,
+    inputs: [
+      {
+        internalType: 'bytes32',
+        name: 'node',
+        type: 'bytes32',
+      },
+      {
+        internalType: 'bytes32',
+        name: 'label',
+        type: 'bytes32',
+      },
+      {
+        internalType: 'address',
+        name: 'owner',
+        type: 'address',
+      },
+      {
+        internalType: 'address',
+        name: 'resolver',
+        type: 'address',
+      },
+      {
+        internalType: 'uint64',
+        name: 'ttl',
+        type: 'uint64',
+      },
+    ],
+    name: 'setSubnodeRecord',
+    outputs: [],
+    payable: false,
+    stateMutability: 'nonpayable',
+    type: 'function',
+  },
+  {
+    constant: false,
+    inputs: [
+      {
+        internalType: 'bytes32',
+        name: 'node',
+        type: 'bytes32',
+      },
+      {
+        internalType: 'uint64',
+        name: 'ttl',
+        type: 'uint64',
+      },
+    ],
+    name: 'setTTL',
+    outputs: [],
+    payable: false,
+    stateMutability: 'nonpayable',
+    type: 'function',
+  },
+  {
+    constant: true,
+    inputs: [
+      {
+        internalType: 'bytes32',
+        name: 'node',
+        type: 'bytes32',
+      },
+    ],
+    name: 'ttl',
+    outputs: [
+      {
+        internalType: 'uint64',
+        name: '',
+        type: 'uint64',
+      },
+    ],
+    payable: false,
+    stateMutability: 'view',
+    type: 'function',
+  },
+] as const
+
+export class EnsRegistrar__factory {
+  static readonly abi = _abi
+  static createInterface(): EnsRegistrarInterface {
+    return new utils.Interface(_abi) as EnsRegistrarInterface
+  }
+  static connect(address: string, signerOrProvider: Signer | Provider): EnsRegistrar {
+    return new Contract(address, _abi, signerOrProvider) as EnsRegistrar
+  }
+}
diff --git a/src/libs/abis/src/generated/legacy/factories/Erc1155__factory.ts b/src/libs/abis/src/generated/legacy/factories/Erc1155__factory.ts
new file mode 100644
index 0000000000..5ee272f694
--- /dev/null
+++ b/src/libs/abis/src/generated/legacy/factories/Erc1155__factory.ts
@@ -0,0 +1,67 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+
+import { Contract, Signer, utils } from 'ethers'
+import type { Provider } from '@ethersproject/providers'
+import type { Erc1155, Erc1155Interface } from '../Erc1155'
+
+const _abi = [
+  {
+    constant: true,
+    inputs: [
+      {
+        internalType: 'address',
+        name: '_owner',
+        type: 'address',
+      },
+      {
+        internalType: 'uint256',
+        name: '_id',
+        type: 'uint256',
+      },
+    ],
+    name: 'balanceOf',
+    outputs: [
+      {
+        internalType: 'uint256',
+        name: '',
+        type: 'uint256',
+      },
+    ],
+    payable: false,
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    constant: true,
+    inputs: [
+      {
+        internalType: 'uint256',
+        name: '_id',
+        type: 'uint256',
+      },
+    ],
+    name: 'uri',
+    outputs: [
+      {
+        internalType: 'string',
+        name: '',
+        type: 'string',
+      },
+    ],
+    payable: false,
+    stateMutability: 'view',
+    type: 'function',
+  },
+] as const
+
+export class Erc1155__factory {
+  static readonly abi = _abi
+  static createInterface(): Erc1155Interface {
+    return new utils.Interface(_abi) as Erc1155Interface
+  }
+  static connect(address: string, signerOrProvider: Signer | Provider): Erc1155 {
+    return new Contract(address, _abi, signerOrProvider) as Erc1155
+  }
+}
diff --git a/src/libs/abis/src/generated/legacy/factories/Erc20__factory.ts b/src/libs/abis/src/generated/legacy/factories/Erc20__factory.ts
new file mode 100644
index 0000000000..d0ccd7b39f
--- /dev/null
+++ b/src/libs/abis/src/generated/legacy/factories/Erc20__factory.ts
@@ -0,0 +1,240 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+
+import { Contract, Signer, utils } from 'ethers'
+import type { Provider } from '@ethersproject/providers'
+import type { Erc20, Erc20Interface } from '../Erc20'
+
+const _abi = [
+  {
+    constant: true,
+    inputs: [],
+    name: 'name',
+    outputs: [
+      {
+        name: '',
+        type: 'string',
+      },
+    ],
+    payable: false,
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    constant: false,
+    inputs: [
+      {
+        name: '_spender',
+        type: 'address',
+      },
+      {
+        name: '_value',
+        type: 'uint256',
+      },
+    ],
+    name: 'approve',
+    outputs: [
+      {
+        name: '',
+        type: 'bool',
+      },
+    ],
+    payable: false,
+    stateMutability: 'nonpayable',
+    type: 'function',
+  },
+  {
+    constant: true,
+    inputs: [],
+    name: 'totalSupply',
+    outputs: [
+      {
+        name: '',
+        type: 'uint256',
+      },
+    ],
+    payable: false,
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    constant: false,
+    inputs: [
+      {
+        name: '_from',
+        type: 'address',
+      },
+      {
+        name: '_to',
+        type: 'address',
+      },
+      {
+        name: '_value',
+        type: 'uint256',
+      },
+    ],
+    name: 'transferFrom',
+    outputs: [
+      {
+        name: '',
+        type: 'bool',
+      },
+    ],
+    payable: false,
+    stateMutability: 'nonpayable',
+    type: 'function',
+  },
+  {
+    constant: true,
+    inputs: [],
+    name: 'decimals',
+    outputs: [
+      {
+        name: '',
+        type: 'uint8',
+      },
+    ],
+    payable: false,
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    constant: true,
+    inputs: [
+      {
+        name: '_owner',
+        type: 'address',
+      },
+    ],
+    name: 'balanceOf',
+    outputs: [
+      {
+        name: 'balance',
+        type: 'uint256',
+      },
+    ],
+    payable: false,
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    constant: true,
+    inputs: [],
+    name: 'symbol',
+    outputs: [
+      {
+        name: '',
+        type: 'string',
+      },
+    ],
+    payable: false,
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    constant: false,
+    inputs: [
+      {
+        name: '_to',
+        type: 'address',
+      },
+      {
+        name: '_value',
+        type: 'uint256',
+      },
+    ],
+    name: 'transfer',
+    outputs: [
+      {
+        name: '',
+        type: 'bool',
+      },
+    ],
+    payable: false,
+    stateMutability: 'nonpayable',
+    type: 'function',
+  },
+  {
+    constant: true,
+    inputs: [
+      {
+        name: '_owner',
+        type: 'address',
+      },
+      {
+        name: '_spender',
+        type: 'address',
+      },
+    ],
+    name: 'allowance',
+    outputs: [
+      {
+        name: '',
+        type: 'uint256',
+      },
+    ],
+    payable: false,
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    payable: true,
+    stateMutability: 'payable',
+    type: 'fallback',
+  },
+  {
+    anonymous: false,
+    inputs: [
+      {
+        indexed: true,
+        name: 'owner',
+        type: 'address',
+      },
+      {
+        indexed: true,
+        name: 'spender',
+        type: 'address',
+      },
+      {
+        indexed: false,
+        name: 'value',
+        type: 'uint256',
+      },
+    ],
+    name: 'Approval',
+    type: 'event',
+  },
+  {
+    anonymous: false,
+    inputs: [
+      {
+        indexed: true,
+        name: 'from',
+        type: 'address',
+      },
+      {
+        indexed: true,
+        name: 'to',
+        type: 'address',
+      },
+      {
+        indexed: false,
+        name: 'value',
+        type: 'uint256',
+      },
+    ],
+    name: 'Transfer',
+    type: 'event',
+  },
+] as const
+
+export class Erc20__factory {
+  static readonly abi = _abi
+  static createInterface(): Erc20Interface {
+    return new utils.Interface(_abi) as Erc20Interface
+  }
+  static connect(address: string, signerOrProvider: Signer | Provider): Erc20 {
+    return new Contract(address, _abi, signerOrProvider) as Erc20
+  }
+}
diff --git a/src/libs/abis/src/generated/legacy/factories/Erc20_bytes32__factory.ts b/src/libs/abis/src/generated/legacy/factories/Erc20_bytes32__factory.ts
new file mode 100644
index 0000000000..f5baf48a6c
--- /dev/null
+++ b/src/libs/abis/src/generated/legacy/factories/Erc20_bytes32__factory.ts
@@ -0,0 +1,48 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+
+import { Contract, Signer, utils } from 'ethers'
+import type { Provider } from '@ethersproject/providers'
+import type { Erc20_bytes32, Erc20_bytes32Interface } from '../Erc20_bytes32'
+
+const _abi = [
+  {
+    constant: true,
+    inputs: [],
+    name: 'name',
+    outputs: [
+      {
+        name: '',
+        type: 'bytes32',
+      },
+    ],
+    payable: false,
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    constant: true,
+    inputs: [],
+    name: 'symbol',
+    outputs: [
+      {
+        name: '',
+        type: 'bytes32',
+      },
+    ],
+    payable: false,
+    stateMutability: 'view',
+    type: 'function',
+  },
+] as const
+
+export class Erc20_bytes32__factory {
+  static readonly abi = _abi
+  static createInterface(): Erc20_bytes32Interface {
+    return new utils.Interface(_abi) as Erc20_bytes32Interface
+  }
+  static connect(address: string, signerOrProvider: Signer | Provider): Erc20_bytes32 {
+    return new Contract(address, _abi, signerOrProvider) as Erc20_bytes32
+  }
+}
diff --git a/src/libs/abis/src/generated/legacy/factories/Erc721__factory.ts b/src/libs/abis/src/generated/legacy/factories/Erc721__factory.ts
new file mode 100644
index 0000000000..eb5664f215
--- /dev/null
+++ b/src/libs/abis/src/generated/legacy/factories/Erc721__factory.ts
@@ -0,0 +1,58 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+
+import { Contract, Signer, utils } from 'ethers'
+import type { Provider } from '@ethersproject/providers'
+import type { Erc721, Erc721Interface } from '../Erc721'
+
+const _abi = [
+  {
+    inputs: [
+      {
+        internalType: 'uint256',
+        name: 'tokenId',
+        type: 'uint256',
+      },
+    ],
+    name: 'ownerOf',
+    outputs: [
+      {
+        internalType: 'address',
+        name: '',
+        type: 'address',
+      },
+    ],
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    inputs: [
+      {
+        internalType: 'uint256',
+        name: 'tokenId',
+        type: 'uint256',
+      },
+    ],
+    name: 'tokenURI',
+    outputs: [
+      {
+        internalType: 'string',
+        name: '',
+        type: 'string',
+      },
+    ],
+    stateMutability: 'view',
+    type: 'function',
+  },
+] as const
+
+export class Erc721__factory {
+  static readonly abi = _abi
+  static createInterface(): Erc721Interface {
+    return new utils.Interface(_abi) as Erc721Interface
+  }
+  static connect(address: string, signerOrProvider: Signer | Provider): Erc721 {
+    return new Contract(address, _abi, signerOrProvider) as Erc721
+  }
+}
diff --git a/src/libs/abis/src/generated/legacy/factories/UniswapInterfaceMulticall__factory.ts b/src/libs/abis/src/generated/legacy/factories/UniswapInterfaceMulticall__factory.ts
new file mode 100644
index 0000000000..9595388bda
--- /dev/null
+++ b/src/libs/abis/src/generated/legacy/factories/UniswapInterfaceMulticall__factory.ts
@@ -0,0 +1,141 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+import { Signer, utils, Contract, ContractFactory, Overrides } from 'ethers'
+import type { Provider, TransactionRequest } from '@ethersproject/providers'
+import type { PromiseOrValue } from '../common'
+import type { UniswapInterfaceMulticall, UniswapInterfaceMulticallInterface } from '../UniswapInterfaceMulticall'
+
+const _abi = [
+  {
+    inputs: [],
+    name: 'getCurrentBlockTimestamp',
+    outputs: [
+      {
+        internalType: 'uint256',
+        name: 'timestamp',
+        type: 'uint256',
+      },
+    ],
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    inputs: [
+      {
+        internalType: 'address',
+        name: 'addr',
+        type: 'address',
+      },
+    ],
+    name: 'getEthBalance',
+    outputs: [
+      {
+        internalType: 'uint256',
+        name: 'balance',
+        type: 'uint256',
+      },
+    ],
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    inputs: [
+      {
+        components: [
+          {
+            internalType: 'address',
+            name: 'target',
+            type: 'address',
+          },
+          {
+            internalType: 'uint256',
+            name: 'gasLimit',
+            type: 'uint256',
+          },
+          {
+            internalType: 'bytes',
+            name: 'callData',
+            type: 'bytes',
+          },
+        ],
+        internalType: 'struct UniswapInterfaceMulticall.Call[]',
+        name: 'calls',
+        type: 'tuple[]',
+      },
+    ],
+    name: 'multicall',
+    outputs: [
+      {
+        internalType: 'uint256',
+        name: 'blockNumber',
+        type: 'uint256',
+      },
+      {
+        components: [
+          {
+            internalType: 'bool',
+            name: 'success',
+            type: 'bool',
+          },
+          {
+            internalType: 'uint256',
+            name: 'gasUsed',
+            type: 'uint256',
+          },
+          {
+            internalType: 'bytes',
+            name: 'returnData',
+            type: 'bytes',
+          },
+        ],
+        internalType: 'struct UniswapInterfaceMulticall.Result[]',
+        name: 'returnData',
+        type: 'tuple[]',
+      },
+    ],
+    stateMutability: 'nonpayable',
+    type: 'function',
+  },
+] as const
+
+const _bytecode =
+  '0x608060405234801561001057600080fd5b50610567806100206000396000f3fe608060405234801561001057600080fd5b50600436106100415760003560e01c80630f28c97d146100465780631749e1e3146100645780634d2301cc14610085575b600080fd5b61004e610098565b60405161005b919061041f565b60405180910390f35b6100776100723660046102a7565b61009c565b60405161005b929190610428565b61004e610093366004610286565b610220565b4290565b8051439060609067ffffffffffffffff811180156100b957600080fd5b506040519080825280602002602001820160405280156100f357816020015b6100e061023a565b8152602001906001900390816100d85790505b50905060005b835181101561021a57600080600086848151811061011357fe5b60200260200101516000015187858151811061012b57fe5b60200260200101516020015188868151811061014357fe5b60200260200101516040015192509250925060005a90506000808573ffffffffffffffffffffffffffffffffffffffff1685856040516101839190610403565b60006040518083038160008787f1925050503d80600081146101c1576040519150601f19603f3d011682016040523d82523d6000602084013e6101c6565b606091505b509150915060005a8403905060405180606001604052808415158152602001828152602001838152508989815181106101fb57fe5b60200260200101819052505050505050505080806001019150506100f9565b50915091565b73ffffffffffffffffffffffffffffffffffffffff163190565b604051806060016040528060001515815260200160008152602001606081525090565b803573ffffffffffffffffffffffffffffffffffffffff8116811461028157600080fd5b919050565b600060208284031215610297578081fd5b6102a08261025d565b9392505050565b600060208083850312156102b9578182fd5b823567ffffffffffffffff808211156102d0578384fd5b818501915085601f8301126102e3578384fd5b8135818111156102ef57fe5b6102fc8485830201610506565b81815284810190848601875b848110156103f457813587017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0606081838f03011215610346578a8bfd5b60408051606081018181108b8211171561035c57fe5b8252610369848d0161025d565b8152818401358c82015260608401358a811115610384578d8efd5b8085019450508e603f850112610398578c8dfd5b8b8401358a8111156103a657fe5b6103b68d85601f84011601610506565b93508084528f838287010111156103cb578d8efd5b808386018e86013783018c018d9052908101919091528552509287019290870190600101610308565b50909998505050505050505050565b6000825161041581846020870161052a565b9190910192915050565b90815260200190565b600060408083018584526020828186015281865180845260609350838701915083838202880101838901875b838110156104f6578983037fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa001855281518051151584528681015187850152880151888401889052805188850181905260806104b582828801858c0161052a565b96880196601f919091017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe01694909401909301925090850190600101610454565b50909a9950505050505050505050565b60405181810167ffffffffffffffff8111828210171561052257fe5b604052919050565b60005b8381101561054557818101518382015260200161052d565b83811115610554576000848401525b5050505056fea164736f6c6343000706000a'
+
+type UniswapInterfaceMulticallConstructorParams = [signer?: Signer] | ConstructorParameters<typeof ContractFactory>
+
+const isSuperArgs = (
+  xs: UniswapInterfaceMulticallConstructorParams
+): xs is ConstructorParameters<typeof ContractFactory> => xs.length > 1
+
+export class UniswapInterfaceMulticall__factory extends ContractFactory {
+  constructor(...args: UniswapInterfaceMulticallConstructorParams) {
+    if (isSuperArgs(args)) {
+      super(...args)
+    } else {
+      super(_abi, _bytecode, args[0])
+    }
+  }
+
+  override deploy(overrides?: Overrides & { from?: PromiseOrValue<string> }): Promise<UniswapInterfaceMulticall> {
+    return super.deploy(overrides || {}) as Promise<UniswapInterfaceMulticall>
+  }
+  override getDeployTransaction(overrides?: Overrides & { from?: PromiseOrValue<string> }): TransactionRequest {
+    return super.getDeployTransaction(overrides || {})
+  }
+  override attach(address: string): UniswapInterfaceMulticall {
+    return super.attach(address) as UniswapInterfaceMulticall
+  }
+  override connect(signer: Signer): UniswapInterfaceMulticall__factory {
+    return super.connect(signer) as UniswapInterfaceMulticall__factory
+  }
+
+  static readonly bytecode = _bytecode
+  static readonly abi = _abi
+  static createInterface(): UniswapInterfaceMulticallInterface {
+    return new utils.Interface(_abi) as UniswapInterfaceMulticallInterface
+  }
+  static connect(address: string, signerOrProvider: Signer | Provider): UniswapInterfaceMulticall {
+    return new Contract(address, _abi, signerOrProvider) as UniswapInterfaceMulticall
+  }
+}
diff --git a/src/libs/abis/src/generated/legacy/factories/Weth__factory.ts b/src/libs/abis/src/generated/legacy/factories/Weth__factory.ts
new file mode 100644
index 0000000000..af4234b83f
--- /dev/null
+++ b/src/libs/abis/src/generated/legacy/factories/Weth__factory.ts
@@ -0,0 +1,297 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+
+import { Contract, Signer, utils } from 'ethers'
+import type { Provider } from '@ethersproject/providers'
+import type { Weth, WethInterface } from '../Weth'
+
+const _abi = [
+  {
+    constant: true,
+    inputs: [],
+    name: 'name',
+    outputs: [
+      {
+        name: '',
+        type: 'string',
+      },
+    ],
+    payable: false,
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    constant: false,
+    inputs: [
+      {
+        name: 'guy',
+        type: 'address',
+      },
+      {
+        name: 'wad',
+        type: 'uint256',
+      },
+    ],
+    name: 'approve',
+    outputs: [
+      {
+        name: '',
+        type: 'bool',
+      },
+    ],
+    payable: false,
+    stateMutability: 'nonpayable',
+    type: 'function',
+  },
+  {
+    constant: true,
+    inputs: [],
+    name: 'totalSupply',
+    outputs: [
+      {
+        name: '',
+        type: 'uint256',
+      },
+    ],
+    payable: false,
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    constant: false,
+    inputs: [
+      {
+        name: 'src',
+        type: 'address',
+      },
+      {
+        name: 'dst',
+        type: 'address',
+      },
+      {
+        name: 'wad',
+        type: 'uint256',
+      },
+    ],
+    name: 'transferFrom',
+    outputs: [
+      {
+        name: '',
+        type: 'bool',
+      },
+    ],
+    payable: false,
+    stateMutability: 'nonpayable',
+    type: 'function',
+  },
+  {
+    constant: false,
+    inputs: [
+      {
+        name: 'wad',
+        type: 'uint256',
+      },
+    ],
+    name: 'withdraw',
+    outputs: [],
+    payable: false,
+    stateMutability: 'nonpayable',
+    type: 'function',
+  },
+  {
+    constant: true,
+    inputs: [],
+    name: 'decimals',
+    outputs: [
+      {
+        name: '',
+        type: 'uint8',
+      },
+    ],
+    payable: false,
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    constant: true,
+    inputs: [
+      {
+        name: '',
+        type: 'address',
+      },
+    ],
+    name: 'balanceOf',
+    outputs: [
+      {
+        name: '',
+        type: 'uint256',
+      },
+    ],
+    payable: false,
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    constant: true,
+    inputs: [],
+    name: 'symbol',
+    outputs: [
+      {
+        name: '',
+        type: 'string',
+      },
+    ],
+    payable: false,
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    constant: false,
+    inputs: [
+      {
+        name: 'dst',
+        type: 'address',
+      },
+      {
+        name: 'wad',
+        type: 'uint256',
+      },
+    ],
+    name: 'transfer',
+    outputs: [
+      {
+        name: '',
+        type: 'bool',
+      },
+    ],
+    payable: false,
+    stateMutability: 'nonpayable',
+    type: 'function',
+  },
+  {
+    constant: false,
+    inputs: [],
+    name: 'deposit',
+    outputs: [],
+    payable: true,
+    stateMutability: 'payable',
+    type: 'function',
+  },
+  {
+    constant: true,
+    inputs: [
+      {
+        name: '',
+        type: 'address',
+      },
+      {
+        name: '',
+        type: 'address',
+      },
+    ],
+    name: 'allowance',
+    outputs: [
+      {
+        name: '',
+        type: 'uint256',
+      },
+    ],
+    payable: false,
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    payable: true,
+    stateMutability: 'payable',
+    type: 'fallback',
+  },
+  {
+    anonymous: false,
+    inputs: [
+      {
+        indexed: true,
+        name: 'src',
+        type: 'address',
+      },
+      {
+        indexed: true,
+        name: 'guy',
+        type: 'address',
+      },
+      {
+        indexed: false,
+        name: 'wad',
+        type: 'uint256',
+      },
+    ],
+    name: 'Approval',
+    type: 'event',
+  },
+  {
+    anonymous: false,
+    inputs: [
+      {
+        indexed: true,
+        name: 'src',
+        type: 'address',
+      },
+      {
+        indexed: true,
+        name: 'dst',
+        type: 'address',
+      },
+      {
+        indexed: false,
+        name: 'wad',
+        type: 'uint256',
+      },
+    ],
+    name: 'Transfer',
+    type: 'event',
+  },
+  {
+    anonymous: false,
+    inputs: [
+      {
+        indexed: true,
+        name: 'dst',
+        type: 'address',
+      },
+      {
+        indexed: false,
+        name: 'wad',
+        type: 'uint256',
+      },
+    ],
+    name: 'Deposit',
+    type: 'event',
+  },
+  {
+    anonymous: false,
+    inputs: [
+      {
+        indexed: true,
+        name: 'src',
+        type: 'address',
+      },
+      {
+        indexed: false,
+        name: 'wad',
+        type: 'uint256',
+      },
+    ],
+    name: 'Withdrawal',
+    type: 'event',
+  },
+] as const
+
+export class Weth__factory {
+  static readonly abi = _abi
+  static createInterface(): WethInterface {
+    return new utils.Interface(_abi) as WethInterface
+  }
+  static connect(address: string, signerOrProvider: Signer | Provider): Weth {
+    return new Contract(address, _abi, signerOrProvider) as Weth
+  }
+}
diff --git a/src/libs/abis/src/generated/legacy/factories/index.ts b/src/libs/abis/src/generated/legacy/factories/index.ts
new file mode 100644
index 0000000000..1de30588e1
--- /dev/null
+++ b/src/libs/abis/src/generated/legacy/factories/index.ts
@@ -0,0 +1,14 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+export { UniswapInterfaceMulticall__factory } from './UniswapInterfaceMulticall__factory'
+export { ArgentWalletContract__factory } from './ArgentWalletContract__factory'
+export { ArgentWalletDetector__factory } from './ArgentWalletDetector__factory'
+export { Eip_2612__factory } from './Eip_2612__factory'
+export { EnsPublicResolver__factory } from './EnsPublicResolver__factory'
+export { EnsRegistrar__factory } from './EnsRegistrar__factory'
+export { Erc1155__factory } from './Erc1155__factory'
+export { Erc20__factory } from './Erc20__factory'
+export { Erc20_bytes32__factory } from './Erc20_bytes32__factory'
+export { Erc721__factory } from './Erc721__factory'
+export { Weth__factory } from './Weth__factory'
diff --git a/src/libs/abis/src/generated/legacy/index.ts b/src/libs/abis/src/generated/legacy/index.ts
new file mode 100644
index 0000000000..a8a6623094
--- /dev/null
+++ b/src/libs/abis/src/generated/legacy/index.ts
@@ -0,0 +1,26 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+export type { UniswapInterfaceMulticall } from './UniswapInterfaceMulticall'
+export type { ArgentWalletContract } from './ArgentWalletContract'
+export type { ArgentWalletDetector } from './ArgentWalletDetector'
+export type { Eip_2612 } from './Eip_2612'
+export type { EnsPublicResolver } from './EnsPublicResolver'
+export type { EnsRegistrar } from './EnsRegistrar'
+export type { Erc1155 } from './Erc1155'
+export type { Erc20 } from './Erc20'
+export type { Erc20_bytes32 } from './Erc20_bytes32'
+export type { Erc721 } from './Erc721'
+export type { Weth } from './Weth'
+export * as factories from './factories'
+export { ArgentWalletContract__factory } from './factories/ArgentWalletContract__factory'
+export { ArgentWalletDetector__factory } from './factories/ArgentWalletDetector__factory'
+export { Eip_2612__factory } from './factories/Eip_2612__factory'
+export { EnsPublicResolver__factory } from './factories/EnsPublicResolver__factory'
+export { EnsRegistrar__factory } from './factories/EnsRegistrar__factory'
+export { Erc1155__factory } from './factories/Erc1155__factory'
+export { Erc20_bytes32__factory } from './factories/Erc20_bytes32__factory'
+export { Erc20__factory } from './factories/Erc20__factory'
+export { Erc721__factory } from './factories/Erc721__factory'
+export { UniswapInterfaceMulticall__factory } from './factories/UniswapInterfaceMulticall__factory'
+export { Weth__factory } from './factories/Weth__factory'
diff --git a/src/libs/abis/src/index.ts b/src/libs/abis/src/index.ts
new file mode 100644
index 0000000000..c73cb698e7
--- /dev/null
+++ b/src/libs/abis/src/index.ts
@@ -0,0 +1,42 @@
+// Custom
+export * from './generated/custom'
+export type { GPv2Order } from './generated/custom/ComposableCoW'
+export const GPv2SettlementAbi = require('./abis/GPv2Settlement.json')
+export const ComposableCoWAbi = require('./abis/ComposableCoW.json')
+export const vCowAbi = require('./abis/vCow.json')
+export const SignatureVerifierMuxerAbi = require('./abis/SignatureVerifierMuxer.json')
+export const MerkleDropAbi = require('./abis/MerkleDrop.json')
+export const TokenDistroAbi = require('./abis/TokenDistro.json')
+
+// Legacy
+export type {
+  ArgentWalletContract,
+  ArgentWalletDetector,
+  EnsPublicResolver,
+  EnsRegistrar,
+  Erc20,
+  Erc721,
+  Erc1155,
+  Weth,
+  UniswapInterfaceMulticall,
+} from './generated/legacy'
+
+export type { Erc20Interface } from './generated/legacy/Erc20'
+
+// EthFlow
+export type { CoWSwapEthFlow } from './generated/ethflow'
+export const ethFlowBarnJson = require('@cowprotocol/ethflowcontract/networks.barn.json')
+export const ethFlowProdJson = require('@cowprotocol/ethflowcontract/networks.prod.json')
+
+// Legacy ABIs
+export const ArgentWalletContractAbi = require('./abis-legacy/argent-wallet-contract.json')
+export const ArgentWalletDetectorAbi = require('./abis-legacy/argent-wallet-detector.json')
+export const CoWSwapEthFlowJson = require('@cowprotocol/ethflowcontract/artifacts/CoWSwapEthFlow.sol/CoWSwapEthFlow.json')
+export const Eip2612Abi = require('./abis-legacy/eip_2612.json')
+export const EnsPublicResolverAbi = require('./abis-legacy/ens-public-resolver.json')
+export const EnsAbi = require('./abis-legacy/ens-registrar.json')
+export const Erc1155Abi = require('./abis-legacy/erc1155.json')
+export const Erc20Abi = require('./abis-legacy/erc20.json')
+export const Erc20Bytes32Abi = require('./abis-legacy/erc20_bytes32.json')
+export const Erc721Abi = require('./abis-legacy/erc721.json')
+export const WethAbi = require('./abis-legacy/weth.json')
diff --git a/src/libs/abis/tsconfig.json b/src/libs/abis/tsconfig.json
new file mode 100644
index 0000000000..8122543a9a
--- /dev/null
+++ b/src/libs/abis/tsconfig.json
@@ -0,0 +1,22 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "compilerOptions": {
+    "module": "commonjs",
+    "forceConsistentCasingInFileNames": true,
+    "strict": true,
+    "noImplicitOverride": true,
+    "noPropertyAccessFromIndexSignature": true,
+    "noImplicitReturns": true,
+    "noFallthroughCasesInSwitch": true
+  },
+  "files": [],
+  "include": [],
+  "references": [
+    {
+      "path": "./tsconfig.lib.json"
+    },
+    {
+      "path": "./tsconfig.spec.json"
+    }
+  ]
+}
diff --git a/src/libs/abis/tsconfig.lib.json b/src/libs/abis/tsconfig.lib.json
new file mode 100644
index 0000000000..4befa7f099
--- /dev/null
+++ b/src/libs/abis/tsconfig.lib.json
@@ -0,0 +1,10 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../../dist/out-tsc",
+    "declaration": true,
+    "types": ["node"]
+  },
+  "include": ["src/**/*.ts"],
+  "exclude": ["jest.config.ts", "src/**/*.spec.ts", "src/**/*.test.ts"]
+}
diff --git a/src/libs/abis/tsconfig.spec.json b/src/libs/abis/tsconfig.spec.json
new file mode 100644
index 0000000000..b2ee74a6b1
--- /dev/null
+++ b/src/libs/abis/tsconfig.spec.json
@@ -0,0 +1,9 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../../dist/out-tsc",
+    "module": "commonjs",
+    "types": ["jest", "node"]
+  },
+  "include": ["jest.config.ts", "src/**/*.test.ts", "src/**/*.spec.ts", "src/**/*.d.ts"]
+}
diff --git a/src/libs/abis/vite.config.ts b/src/libs/abis/vite.config.ts
new file mode 100644
index 0000000000..2146988852
--- /dev/null
+++ b/src/libs/abis/vite.config.ts
@@ -0,0 +1,48 @@
+/// <reference types="vitest" />
+import { joinPathFragments } from '@nx/devkit'
+import { defineConfig } from 'vite'
+import dts from 'vite-plugin-dts'
+import viteTsConfigPaths from 'vite-tsconfig-paths'
+
+export default defineConfig({
+  cacheDir: '../../../node_modules/.vite/abis',
+
+  plugins: [
+    dts({
+      entryRoot: 'src',
+      tsConfigFilePath: joinPathFragments(__dirname, 'tsconfig.lib.json'),
+      skipDiagnostics: true,
+    }),
+
+    viteTsConfigPaths({
+      root: '../../../',
+    }),
+  ],
+
+  // Uncomment this if you are using workers.
+  // worker: {
+  //  plugins: [
+  //    viteTsConfigPaths({
+  //      root: '../../../',
+  //    }),
+  //  ],
+  // },
+
+  // Configuration for building your library.
+  // See: https://vitejs.dev/guide/build.html#library-mode
+  build: {
+    lib: {
+      // Could also be a dictionary or array of multiple entry points.
+      entry: 'src/index.ts',
+      name: 'abis',
+      fileName: 'index',
+      // Change this to the formats you want to support.
+      // Don't forgot to update your package.json as well.
+      formats: ['es', 'cjs'],
+    },
+    rollupOptions: {
+      // External packages that should not be bundled into your library.
+      external: [],
+    },
+  },
+})
diff --git a/src/libs/abis/yarn.lock b/src/libs/abis/yarn.lock
new file mode 100644
index 0000000000..fb57ccd13a
--- /dev/null
+++ b/src/libs/abis/yarn.lock
@@ -0,0 +1,4 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
diff --git a/src/libs/widget-react/src/lib/CowSwapWidget.spec.tsx b/src/libs/widget-react/src/lib/CowSwapWidget.spec.tsx
index becdda9a70..ccf11e85f0 100644
--- a/src/libs/widget-react/src/lib/CowSwapWidget.spec.tsx
+++ b/src/libs/widget-react/src/lib/CowSwapWidget.spec.tsx
@@ -1,10 +1,11 @@
-import { render } from '@testing-library/react'
-
-// import { CowSwapWidget } from './CowSwapWidget'
+import { CowSwapWidget } from './CowSwapWidget'
 
 describe('CowSwapWidget', () => {
   it('should render successfully', () => {
     // const { baseElement } = render(<CowSwapWidget params={{}} settings={{}} />)
     // expect(baseElement).toBeTruthy()
+    expect(CowSwapWidget).toBeTruthy()
   })
 })
+
+export {}
diff --git a/src/libs/widget-react/vite.config.ts b/src/libs/widget-react/vite.config.ts
index 15a351e00e..82a40dd645 100644
--- a/src/libs/widget-react/vite.config.ts
+++ b/src/libs/widget-react/vite.config.ts
@@ -1,9 +1,9 @@
 /// <reference types="vitest" />
-import { defineConfig } from 'vite'
+import { joinPathFragments } from '@nx/devkit'
 import react from '@vitejs/plugin-react'
-import viteTsConfigPaths from 'vite-tsconfig-paths'
+import { defineConfig } from 'vite'
 import dts from 'vite-plugin-dts'
-import { joinPathFragments } from '@nx/devkit'
+import viteTsConfigPaths from 'vite-tsconfig-paths'
 
 export default defineConfig({
   cacheDir: '../../../node_modules/.vite/widget-react',
diff --git a/src/modules/advancedOrders/hooks/useComposableCowContract.ts b/src/modules/advancedOrders/hooks/useComposableCowContract.ts
index 4a83b82589..4fc2739246 100644
--- a/src/modules/advancedOrders/hooks/useComposableCowContract.ts
+++ b/src/modules/advancedOrders/hooks/useComposableCowContract.ts
@@ -1,13 +1,12 @@
+import { ComposableCoW, ComposableCoWAbi } from '@cowprotocol/abis'
+
 import { useContract } from 'legacy/hooks/useContract'
 
 import { useWalletInfo } from 'modules/wallet'
 
-import COMPOSABLE_COW_ABI from 'abis/ComposableCoW.json'
-import { ComposableCoW } from 'abis/types'
-
 import { COMPOSABLE_COW_ADDRESS } from '../const'
 
 export function useComposableCowContract(): ComposableCoW | null {
   const { chainId } = useWalletInfo()
-  return useContract<ComposableCoW>(chainId ? COMPOSABLE_COW_ADDRESS[chainId] : undefined, COMPOSABLE_COW_ABI, true)
+  return useContract<ComposableCoW>(chainId ? COMPOSABLE_COW_ADDRESS[chainId] : undefined, ComposableCoWAbi, true)
 }
diff --git a/src/modules/limitOrders/services/types.ts b/src/modules/limitOrders/services/types.ts
index 9db607f647..0816daa9bd 100644
--- a/src/modules/limitOrders/services/types.ts
+++ b/src/modules/limitOrders/services/types.ts
@@ -1,15 +1,13 @@
+import { Erc20, GPv2Settlement } from '@cowprotocol/abis'
 import { SupportedChainId } from '@cowprotocol/cow-sdk'
 import { Web3Provider } from '@ethersproject/providers'
 import SafeAppsSDK from '@safe-global/safe-apps-sdk'
 
-import { Erc20 } from 'legacy/abis/types'
 import { AppDispatch } from 'legacy/state'
 import { PostOrderParams } from 'legacy/utils/trade'
 
 import { AppDataInfo, UploadAppDataParams } from 'modules/appData'
 
-import { GPv2Settlement } from 'abis/types'
-
 export interface TradeFlowContext {
   // signer changes creates redundant re-renders
   // validTo must be calculated just before signing of an order
diff --git a/src/modules/operations/bundle/buildApproveTx.ts b/src/modules/operations/bundle/buildApproveTx.ts
index 2637eeda9c..abd22db931 100644
--- a/src/modules/operations/bundle/buildApproveTx.ts
+++ b/src/modules/operations/bundle/buildApproveTx.ts
@@ -1,7 +1,6 @@
+import { Erc20 } from '@cowprotocol/abis'
 import { Currency, CurrencyAmount } from '@uniswap/sdk-core'
 
-import { Erc20 } from 'legacy/abis/types'
-
 import { estimateApprove } from 'common/hooks/useApproveCallback'
 
 export type BuildApproveTxParams = {
diff --git a/src/modules/operations/bundle/buildPresignTx.ts b/src/modules/operations/bundle/buildPresignTx.ts
index f6e6f0537f..d4157a7d5b 100644
--- a/src/modules/operations/bundle/buildPresignTx.ts
+++ b/src/modules/operations/bundle/buildPresignTx.ts
@@ -1,4 +1,4 @@
-import { GPv2Settlement } from 'abis/types'
+import { GPv2Settlement } from '@cowprotocol/abis'
 
 export type BuildPresignTxParams = {
   orderId: string
diff --git a/src/modules/operations/bundle/buildWrapTx.ts b/src/modules/operations/bundle/buildWrapTx.ts
index fb81ad6c1d..0adeb8e0c2 100644
--- a/src/modules/operations/bundle/buildWrapTx.ts
+++ b/src/modules/operations/bundle/buildWrapTx.ts
@@ -1,4 +1,4 @@
-import { Weth } from 'legacy/abis/types'
+import { Weth } from '@cowprotocol/abis'
 
 export type BuildWrapTxParams = {
   wrappedNativeContract: Weth
diff --git a/src/modules/swap/hooks/useFlowContext.ts b/src/modules/swap/hooks/useFlowContext.ts
index cd158e63ad..615ea4b556 100644
--- a/src/modules/swap/hooks/useFlowContext.ts
+++ b/src/modules/swap/hooks/useFlowContext.ts
@@ -1,3 +1,4 @@
+import { Weth } from '@cowprotocol/abis'
 import { OrderClass, OrderKind } from '@cowprotocol/cow-sdk'
 import { Web3Provider } from '@ethersproject/providers'
 import { SafeInfoResponse } from '@safe-global/api-kit'
@@ -6,7 +7,6 @@ import { useWeb3React } from '@web3-react/core'
 
 import { useDispatch } from 'react-redux'
 
-import { Weth } from 'legacy/abis/types'
 import { NATIVE_CURRENCY_BUY_TOKEN } from 'legacy/constants'
 import { GpEther as ETHER } from 'legacy/constants/tokens'
 import { useWETHContract } from 'legacy/hooks/useContract'
diff --git a/src/modules/swap/services/ethFlow/steps/calculateUniqueOrderId.ts b/src/modules/swap/services/ethFlow/steps/calculateUniqueOrderId.ts
index edb4a32741..c86cb5ca84 100644
--- a/src/modules/swap/services/ethFlow/steps/calculateUniqueOrderId.ts
+++ b/src/modules/swap/services/ethFlow/steps/calculateUniqueOrderId.ts
@@ -1,3 +1,4 @@
+import { CoWSwapEthFlow } from '@cowprotocol/abis'
 import type { Order } from '@cowprotocol/contracts'
 import { OrderSigningUtils } from '@cowprotocol/cow-sdk'
 import { CurrencyAmount } from '@uniswap/sdk-core'
@@ -7,7 +8,6 @@ import { getOrderParams, PostOrderParams } from 'legacy/utils/trade'
 
 import { logTradeFlow } from 'modules/trade/utils/logger'
 
-import { CoWSwapEthFlow } from 'abis/types/ethflow'
 import { MAX_VALID_TO_EPOCH } from 'utils/time'
 
 export interface UniqueOrderIdResult {
diff --git a/src/modules/swap/services/ethFlow/steps/signEthFlowOrderStep.ts b/src/modules/swap/services/ethFlow/steps/signEthFlowOrderStep.ts
index 81d82f83a5..669f1def78 100644
--- a/src/modules/swap/services/ethFlow/steps/signEthFlowOrderStep.ts
+++ b/src/modules/swap/services/ethFlow/steps/signEthFlowOrderStep.ts
@@ -1,3 +1,4 @@
+import { CoWSwapEthFlow } from '@cowprotocol/abis'
 import { OrderClass, UnsignedOrder } from '@cowprotocol/cow-sdk'
 import { ContractTransaction } from '@ethersproject/contracts'
 import { NativeCurrency } from '@uniswap/sdk-core'
@@ -9,8 +10,6 @@ import { getOrderParams, mapUnsignedOrderToOrder, PostOrderParams } from 'legacy
 import { ETHFLOW_GAS_LIMIT_DEFAULT } from 'modules/swap/services/ethFlow/const'
 import { logTradeFlow, logTradeFlowError } from 'modules/trade/utils/logger'
 
-import { CoWSwapEthFlow } from 'abis/types/ethflow'
-
 type EthFlowOrderParams = Omit<PostOrderParams, 'sellToken'> & {
   sellToken: NativeCurrency
 }
diff --git a/src/modules/swap/services/safeBundleFlow/safeBundleEthFlow.ts b/src/modules/swap/services/safeBundleFlow/safeBundleEthFlow.ts
index 143e41ede6..6fe5779def 100644
--- a/src/modules/swap/services/safeBundleFlow/safeBundleEthFlow.ts
+++ b/src/modules/swap/services/safeBundleFlow/safeBundleEthFlow.ts
@@ -1,7 +1,7 @@
+import { Erc20 } from '@cowprotocol/abis'
 import { MetaTransactionData } from '@safe-global/safe-core-sdk-types'
 import { Percent } from '@uniswap/sdk-core'
 
-import { Erc20 } from 'legacy/abis/types/Erc20'
 import { PriceImpact } from 'legacy/hooks/usePriceImpact'
 import { partialOrderUpdate } from 'legacy/state/orders/utils'
 import { signAndPostOrder } from 'legacy/utils/trade'
diff --git a/src/modules/swap/services/swapFlow/steps/presignOrderStep.ts b/src/modules/swap/services/swapFlow/steps/presignOrderStep.ts
index 4155e892ec..d87db1825e 100644
--- a/src/modules/swap/services/swapFlow/steps/presignOrderStep.ts
+++ b/src/modules/swap/services/swapFlow/steps/presignOrderStep.ts
@@ -1,3 +1,4 @@
+import { GPv2Settlement } from '@cowprotocol/abis'
 import { BigNumber } from '@ethersproject/bignumber'
 import { ContractTransaction } from '@ethersproject/contracts'
 
@@ -5,8 +6,6 @@ import { calculateGasMargin } from 'legacy/utils/calculateGasMargin'
 
 import { logTradeFlow, logTradeFlowError } from 'modules/trade/utils/logger'
 
-import { GPv2Settlement } from 'abis/types'
-
 // Use a 150K gas as a fallback if there's issue calculating the gas estimation (fixes some issues with some nodes failing to calculate gas costs for SC wallets)
 const PRESIGN_GAS_LIMIT_DEFAULT = BigNumber.from('150000')
 
diff --git a/src/modules/swap/services/types.ts b/src/modules/swap/services/types.ts
index e10afd2f56..905fbe4460 100644
--- a/src/modules/swap/services/types.ts
+++ b/src/modules/swap/services/types.ts
@@ -1,8 +1,9 @@
+import { Erc20, Weth } from '@cowprotocol/abis'
+import { GPv2Settlement, CoWSwapEthFlow } from '@cowprotocol/abis'
 import { Web3Provider } from '@ethersproject/providers'
 import SafeAppsSDK from '@safe-global/safe-apps-sdk'
 import { Currency, CurrencyAmount } from '@uniswap/sdk-core'
 
-import { Erc20, Weth } from 'legacy/abis/types'
 import { AppDispatch } from 'legacy/state'
 import { useTransactionAdder } from 'legacy/state/enhancedTransactions/hooks'
 import { AddOrderCallback } from 'legacy/state/orders/hooks'
@@ -13,9 +14,6 @@ import { UploadAppDataParams, AppDataInfo } from 'modules/appData'
 import { SwapConfirmManager } from 'modules/swap/hooks/useSwapConfirmManager'
 import { SwapFlowAnalyticsContext } from 'modules/trade/utils/analytics'
 
-import { GPv2Settlement } from 'abis/types'
-import { CoWSwapEthFlow } from 'abis/types/ethflow'
-
 import { FlowType } from '../hooks/useFlowContext'
 
 export interface BaseFlowContext {
diff --git a/src/modules/tokens/hooks/useOnchainBalances.ts b/src/modules/tokens/hooks/useOnchainBalances.ts
index 26bf182d8c..43627f8201 100644
--- a/src/modules/tokens/hooks/useOnchainBalances.ts
+++ b/src/modules/tokens/hooks/useOnchainBalances.ts
@@ -1,20 +1,19 @@
 import { useMemo } from 'react'
 
+import { Erc20Interface, Erc20Abi } from '@cowprotocol/abis'
 import { Interface } from '@ethersproject/abi'
 import { ListenerOptionsWithGas } from '@uniswap/redux-multicall'
 import { CurrencyAmount, Token } from '@uniswap/sdk-core'
 
 import JSBI from 'jsbi'
 
-import ERC20ABI from 'legacy/abis/erc20.json'
-import { Erc20Interface } from 'legacy/abis/types/Erc20'
 import { isAddress } from 'legacy/utils'
 
 import { useMultipleContractSingleData } from 'lib/hooks/multicall'
 
 import { BalancesAndAllowances, BalancesAndAllowancesParams, TokenAmounts, TokenAmountsResult } from '../types'
 
-const ERC20Interface = new Interface(ERC20ABI) as Erc20Interface
+const ERC20Interface = new Interface(Erc20Abi) as Erc20Interface
 const DEFAULT_LISTENER_OPTIONS: ListenerOptionsWithGas = { gasRequired: 185_000, blocksPerFetch: 5 }
 
 export interface OnchainAmountsParams {
diff --git a/src/modules/twap/hooks/useExtensibleFallbackContext.ts b/src/modules/twap/hooks/useExtensibleFallbackContext.ts
index 6e7d0998f6..25c570605f 100644
--- a/src/modules/twap/hooks/useExtensibleFallbackContext.ts
+++ b/src/modules/twap/hooks/useExtensibleFallbackContext.ts
@@ -1,3 +1,4 @@
+import { GPv2Settlement } from '@cowprotocol/abis'
 import { SupportedChainId } from '@cowprotocol/cow-sdk'
 import { Web3Provider } from '@ethersproject/providers'
 import { useWeb3React } from '@web3-react/core'
@@ -7,8 +8,6 @@ import { isSupportedChain } from 'legacy/utils/supportedChainId'
 
 import { useWalletInfo } from 'modules/wallet'
 
-import { GPv2Settlement } from 'abis/types'
-
 export interface ExtensibleFallbackContext {
   safeAddress: string
   chainId: SupportedChainId
diff --git a/src/modules/twap/hooks/useFetchTwapOrdersFromSafe.ts b/src/modules/twap/hooks/useFetchTwapOrdersFromSafe.ts
index 583870133d..315a8fa9d9 100644
--- a/src/modules/twap/hooks/useFetchTwapOrdersFromSafe.ts
+++ b/src/modules/twap/hooks/useFetchTwapOrdersFromSafe.ts
@@ -1,8 +1,9 @@
 import { useEffect, useState } from 'react'
 
+import { ComposableCoW } from '@cowprotocol/abis'
+
 import ms from 'ms.macro'
 
-import { ComposableCoW } from 'abis/types'
 import { useSafeApiKit } from 'api/gnosisSafe/hooks/useSafeApiKit'
 
 import { fetchTwapOrdersFromSafe } from '../services/fetchTwapOrdersFromSafe'
diff --git a/src/modules/twap/hooks/useFetchTwapPartOrders.ts b/src/modules/twap/hooks/useFetchTwapPartOrders.ts
index 715d1dd383..0ab8e6167b 100644
--- a/src/modules/twap/hooks/useFetchTwapPartOrders.ts
+++ b/src/modules/twap/hooks/useFetchTwapPartOrders.ts
@@ -1,11 +1,11 @@
 import { useMemo } from 'react'
 
+import { ComposableCoW } from '@cowprotocol/abis'
 import type { Order } from '@cowprotocol/contracts'
 import { OrderParameters, SupportedChainId } from '@cowprotocol/cow-sdk'
 
 import { useAsyncMemo } from 'use-async-memo'
 
-import { ComposableCoW } from 'abis/types'
 import { computeOrderUid } from 'utils/orderUtils/computeOrderUid'
 
 import { TradeableOrderWithSignature, useTwapOrdersTradeableMulticall } from './useTwapOrdersTradeableMulticall'
diff --git a/src/modules/twap/hooks/useTwapOrderCreationContext.ts b/src/modules/twap/hooks/useTwapOrderCreationContext.ts
index e34a9e1209..74fd218501 100644
--- a/src/modules/twap/hooks/useTwapOrderCreationContext.ts
+++ b/src/modules/twap/hooks/useTwapOrderCreationContext.ts
@@ -1,15 +1,15 @@
+import { Erc20 } from '@cowprotocol/abis'
+import { ComposableCoW } from '@cowprotocol/abis'
 import { CurrencyAmount, Token } from '@uniswap/sdk-core'
 
 import { Nullish } from 'types'
 
-import { Erc20 } from 'legacy/abis/types'
 import { useTokenContract } from 'legacy/hooks/useContract'
 
 import { CURRENT_BLOCK_FACTORY_ADDRESS } from 'modules/advancedOrders'
 import { useComposableCowContract } from 'modules/advancedOrders/hooks/useComposableCowContract'
 import { useWalletInfo } from 'modules/wallet'
 
-import { ComposableCoW } from 'abis/types'
 import { useNeedsApproval } from 'common/hooks/useNeedsApproval'
 import { useTradeSpenderAddress } from 'common/hooks/useTradeSpenderAddress'
 
diff --git a/src/modules/twap/hooks/useTwapOrdersAuthMulticall.ts b/src/modules/twap/hooks/useTwapOrdersAuthMulticall.ts
index 722d786c81..4f39c7570a 100644
--- a/src/modules/twap/hooks/useTwapOrdersAuthMulticall.ts
+++ b/src/modules/twap/hooks/useTwapOrdersAuthMulticall.ts
@@ -1,8 +1,8 @@
 import { useMemo } from 'react'
 
+import { ComposableCoW } from '@cowprotocol/abis'
 import { ListenerOptionsWithGas } from '@uniswap/redux-multicall'
 
-import { ComposableCoW } from 'abis/types/ComposableCoW'
 import { useSingleContractMultipleData } from 'lib/hooks/multicall'
 
 import { TwapOrderInfo, TwapOrdersAuthResult } from '../types'
diff --git a/src/modules/twap/hooks/useTwapOrdersTradeableMulticall.ts b/src/modules/twap/hooks/useTwapOrdersTradeableMulticall.ts
index a9da06ed31..458b109c44 100644
--- a/src/modules/twap/hooks/useTwapOrdersTradeableMulticall.ts
+++ b/src/modules/twap/hooks/useTwapOrdersTradeableMulticall.ts
@@ -1,8 +1,8 @@
 import { useMemo } from 'react'
 
+import { ComposableCoW, GPv2Order } from '@cowprotocol/abis'
 import { ListenerOptionsWithGas } from '@uniswap/redux-multicall'
 
-import { ComposableCoW, GPv2Order } from 'abis/types/ComposableCoW'
 import { useSingleContractMultipleData } from 'lib/hooks/multicall'
 
 import { ConditionalOrderParams } from '../types'
diff --git a/src/modules/twap/services/cancelTwapOrderTxs.ts b/src/modules/twap/services/cancelTwapOrderTxs.ts
index 2eecd2b29d..b7ae0ca152 100644
--- a/src/modules/twap/services/cancelTwapOrderTxs.ts
+++ b/src/modules/twap/services/cancelTwapOrderTxs.ts
@@ -1,8 +1,7 @@
+import { ComposableCoW, GPv2Settlement } from '@cowprotocol/abis'
 import { BigNumber } from '@ethersproject/bignumber'
 import { MetaTransactionData } from '@safe-global/safe-core-sdk-types'
 
-import { ComposableCoW, GPv2Settlement } from 'abis/types'
-
 export interface CancelTwapOrderContext {
   composableCowContract: ComposableCoW
   settlementContract: GPv2Settlement
diff --git a/src/modules/twap/services/fetchTwapOrdersFromSafe.ts b/src/modules/twap/services/fetchTwapOrdersFromSafe.ts
index bd1dc314e6..e10ed6b468 100644
--- a/src/modules/twap/services/fetchTwapOrdersFromSafe.ts
+++ b/src/modules/twap/services/fetchTwapOrdersFromSafe.ts
@@ -1,10 +1,9 @@
+import { ComposableCoW } from '@cowprotocol/abis'
 import type SafeApiKit from '@safe-global/api-kit'
 import type { SafeMultisigTransactionResponse } from '@safe-global/safe-core-sdk-types'
 
 import { isTruthy } from 'legacy/utils/misc'
 
-import { ComposableCoW } from 'abis/types'
-
 import { ConditionalOrderParams, TwapOrdersSafeData } from '../types'
 
 // ComposableCoW.createWithContext method
diff --git a/src/modules/twap/services/getSignatureVerifierContract.ts b/src/modules/twap/services/getSignatureVerifierContract.ts
index 18c82dc1a5..d75e61d9f9 100644
--- a/src/modules/twap/services/getSignatureVerifierContract.ts
+++ b/src/modules/twap/services/getSignatureVerifierContract.ts
@@ -1,8 +1,6 @@
+import { SignatureVerifierMuxerAbi, SignatureVerifierMuxer } from '@cowprotocol/abis'
 import { Contract } from '@ethersproject/contracts'
 
-import SignatureVerifierMuxerABI from 'abis/SignatureVerifierMuxer.json'
-import { SignatureVerifierMuxer } from 'abis/types'
-
 import { ExtensibleFallbackContext } from '../hooks/useExtensibleFallbackContext'
 
 export async function getSignatureVerifierContract(
@@ -10,5 +8,5 @@ export async function getSignatureVerifierContract(
 ): Promise<SignatureVerifierMuxer> {
   const { safeAddress, provider } = context
 
-  return new Contract(safeAddress, SignatureVerifierMuxerABI, provider) as SignatureVerifierMuxer
+  return new Contract(safeAddress, SignatureVerifierMuxerAbi, provider) as SignatureVerifierMuxer
 }
diff --git a/src/modules/twap/updaters/TwapOrdersUpdater.tsx b/src/modules/twap/updaters/TwapOrdersUpdater.tsx
index 83deead433..2ec086996a 100644
--- a/src/modules/twap/updaters/TwapOrdersUpdater.tsx
+++ b/src/modules/twap/updaters/TwapOrdersUpdater.tsx
@@ -1,12 +1,11 @@
 import { useAtomValue, useUpdateAtom } from 'jotai/utils'
 import { useEffect, useMemo } from 'react'
 
+import { ComposableCoW } from '@cowprotocol/abis'
 import { SupportedChainId } from '@cowprotocol/cow-sdk'
 
 import { isTruthy } from 'legacy/utils/misc'
 
-import { ComposableCoW } from 'abis/types'
-
 import { TWAP_PENDING_STATUSES } from '../const'
 import { useFetchTwapOrdersFromSafe } from '../hooks/useFetchTwapOrdersFromSafe'
 import { useFetchTwapPartOrders } from '../hooks/useFetchTwapPartOrders'
diff --git a/src/pages/Account/LockedGnoVesting/hooks.ts b/src/pages/Account/LockedGnoVesting/hooks.ts
index d3423f62b8..37a97ec9d7 100644
--- a/src/pages/Account/LockedGnoVesting/hooks.ts
+++ b/src/pages/Account/LockedGnoVesting/hooks.ts
@@ -1,5 +1,6 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 
+import { MerkleDrop, TokenDistro, MerkleDropAbi, TokenDistroAbi } from '@cowprotocol/abis'
 import { SupportedChainId } from '@cowprotocol/cow-sdk'
 import { ContractTransaction } from '@ethersproject/contracts'
 import { CurrencyAmount, Token } from '@uniswap/sdk-core'
@@ -13,9 +14,6 @@ import { useTransactionAdder } from 'legacy/state/enhancedTransactions/hooks'
 
 import { useWalletInfo } from 'modules/wallet'
 
-import MERKLE_DROP_ABI from 'abis/MerkleDrop.json'
-import TOKEN_DISTRO_ABI from 'abis/TokenDistro.json'
-import { MerkleDrop, TokenDistro } from 'abis/types'
 import { useSingleCallResult } from 'lib/hooks/multicall'
 
 import { fetchClaim } from './claimData'
@@ -23,8 +21,8 @@ import { fetchClaim } from './claimData'
 // We just generally use the mainnet version. We don't read from the contract anyways so the address doesn't matter
 const COW = COW_TOKENS[SupportedChainId.MAINNET]
 
-const useMerkleDropContract = () => useContract<MerkleDrop>(MERKLE_DROP_CONTRACT_ADDRESSES, MERKLE_DROP_ABI, true)
-const useTokenDistroContract = () => useContract<TokenDistro>(TOKEN_DISTRO_CONTRACT_ADDRESSES, TOKEN_DISTRO_ABI, true)
+const useMerkleDropContract = () => useContract<MerkleDrop>(MERKLE_DROP_CONTRACT_ADDRESSES, MerkleDropAbi, true)
+const useTokenDistroContract = () => useContract<TokenDistro>(TOKEN_DISTRO_CONTRACT_ADDRESSES, TokenDistroAbi, true)
 
 export const useAllocation = (): CurrencyAmount<Token> => {
   const { chainId, account } = useWalletInfo()
diff --git a/src/pages/error/AnySwapAffectedUsers/useIsAnySwapAffectedUser.ts b/src/pages/error/AnySwapAffectedUsers/useIsAnySwapAffectedUser.ts
index 01451caf5d..07e4baacbe 100644
--- a/src/pages/error/AnySwapAffectedUsers/useIsAnySwapAffectedUser.ts
+++ b/src/pages/error/AnySwapAffectedUsers/useIsAnySwapAffectedUser.ts
@@ -1,11 +1,10 @@
 import { useMemo } from 'react'
 
+import { Erc20Abi, Erc20Interface } from '@cowprotocol/abis'
 import { SupportedChainId as ChainId } from '@cowprotocol/cow-sdk'
 import { Interface } from '@ethersproject/abi'
 import { BigNumber } from '@ethersproject/bignumber'
 
-import ERC20_ABI from 'legacy/abis/erc20.json'
-import { Erc20Interface } from 'legacy/abis/types/Erc20'
 import { ZERO_ADDRESS } from 'legacy/constants/misc'
 import { WRAPPED_NATIVE_CURRENCY as WETH } from 'legacy/constants/tokens'
 
@@ -20,7 +19,7 @@ const WBNB_ADDRESS = '0x418d75f65a02b3d53b2418fb8e1fe493759c7605'
 
 const AFFECTED_TOKENS = [WETH_ADDRESS, PERI_ADDRESS, MATIC_ADDRESS, WBNB_ADDRESS] // relevant tokens for the check
 
-const ERC20_INTERFACE = new Interface(ERC20_ABI) as Erc20Interface
+const ERC20_INTERFACE = new Interface(Erc20Abi) as Erc20Interface
 const ANYSWAP_V4_CONTRACT = '0x6b7a87899490EcE95443e979cA9485CBE7E71522'
 
 // Uncomment to test logic: 0xC92...522 is mainnet VaultRelayer address. Use it with one account that has given some WETH allowance to it
diff --git a/tsconfig.base.json b/tsconfig.base.json
index 398213a384..3a11c8d38c 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -27,7 +27,8 @@
       "@cowprotocol/ui": ["libs/ui/src/index.ts"],
       "@cowprotocol/ui-utils": ["libs/ui-utils/src/index.ts"],
       "@cowprotocol/widget-lib": ["libs/widget-lib/src/index.ts"],
-      "@cowprotocol/widget-react": ["libs/widget-react/src/index.ts"]
+      "@cowprotocol/widget-react": ["libs/widget-react/src/index.ts"],
+      "@cowprotocol/abis": ["libs/abis/src/index.ts"]
     }
   },
   "exclude": ["node_modules", "cypress"]

From 4698681cc5015bc2780785d04848bfca1d4ec6ba Mon Sep 17 00:00:00 2001
From: Alexandr Kazachenko <shoom3301@gmail.com>
Date: Fri, 30 Jun 2023 07:31:05 -0700
Subject: [PATCH 44/67] fix(trade): display Price updated banner in
 Confirmation modal (#2730)

---
 src/common/pure/InlineBanner/index.tsx        |  1 +
 .../SwapModalHeader/SwapModalHeaderMod.tsx    | 26 ++-------
 .../trade/pure/PriceUpdatedBanner/index.tsx   | 55 +++++++++++++++++++
 .../trade/pure/TradeConfirmation/index.tsx    | 40 +++++++++++++-
 4 files changed, 99 insertions(+), 23 deletions(-)
 create mode 100644 src/modules/trade/pure/PriceUpdatedBanner/index.tsx

diff --git a/src/common/pure/InlineBanner/index.tsx b/src/common/pure/InlineBanner/index.tsx
index 67a3fb7518..90f5b9268e 100644
--- a/src/common/pure/InlineBanner/index.tsx
+++ b/src/common/pure/InlineBanner/index.tsx
@@ -57,6 +57,7 @@ const Wrapper = styled.span<{ color: string }>`
     width: var(--size);
     height: var(--size);
     object-fit: contain;
+    stroke: none !important;
   }
 
   > svg > path {
diff --git a/src/legacy/components/swap/SwapModalHeader/SwapModalHeaderMod.tsx b/src/legacy/components/swap/SwapModalHeader/SwapModalHeaderMod.tsx
index 581ffdcca9..77546c5412 100644
--- a/src/legacy/components/swap/SwapModalHeader/SwapModalHeaderMod.tsx
+++ b/src/legacy/components/swap/SwapModalHeader/SwapModalHeaderMod.tsx
@@ -4,15 +4,14 @@ import { Percent, TradeType } from '@uniswap/sdk-core'
 
 import { Trans } from '@lingui/macro'
 import { transparentize } from 'polished'
-import { AlertTriangle, ArrowDown } from 'react-feather'
+import { ArrowDown } from 'react-feather'
 import { Text } from 'rebass'
 import styled, { ThemeContext } from 'styled-components/macro'
 
-import { ButtonPrimary } from 'legacy/components/Button'
 import { AutoColumn } from 'legacy/components/Column'
 import { RowBetween, RowFixed } from 'legacy/components/Row'
 import { AdvancedSwapDetails } from 'legacy/components/swap/AdvancedSwapDetails'
-import { AuxInformationContainer, SwapShowAcceptChanges, TruncatedText } from 'legacy/components/swap/styleds'
+import { AuxInformationContainer, TruncatedText } from 'legacy/components/swap/styleds'
 import { WarningProps } from 'legacy/components/SwapWarnings'
 import { INPUT_OUTPUT_EXPLANATION } from 'legacy/constants'
 import { useHigherUSDValue } from 'legacy/hooks/useStablecoinPrice'
@@ -22,6 +21,8 @@ import { ThemedText } from 'legacy/theme'
 import { isAddress, shortenAddress } from 'legacy/utils'
 import { computeSlippageAdjustedAmounts } from 'legacy/utils/prices'
 
+import { PriceUpdatedBanner } from 'modules/trade/pure/PriceUpdatedBanner'
+
 import { CurrencyLogo } from 'common/pure/CurrencyLogo'
 import { FiatValue } from 'common/pure/FiatValue'
 import { RateInfo, RateInfoParams } from 'common/pure/RateInfo'
@@ -206,24 +207,7 @@ export default function SwapModalHeader({
       )}
       <StyledRateInfo label="Price" stylized={true} rateInfoParams={rateInfoParams} />
       <AdvancedSwapDetails trade={trade} allowedSlippage={allowedSlippage} />
-      {showAcceptChanges ? (
-        <SwapShowAcceptChanges justify="flex-start" gap={'0px'}>
-          <RowBetween>
-            <RowFixed>
-              <AlertTriangle size={20} style={{ marginRight: '8px', minWidth: 24 }} />
-              <ThemedText.Main color={theme.text1}>
-                <Trans>Price Updated</Trans>
-              </ThemedText.Main>
-            </RowFixed>
-            <ButtonPrimary
-              style={{ padding: '.5rem', width: 'fit-content', fontSize: '0.825rem', borderRadius: '12px' }}
-              onClick={onAcceptChanges}
-            >
-              <Trans>Accept</Trans>
-            </ButtonPrimary>
-          </RowBetween>
-        </SwapShowAcceptChanges>
-      ) : null}
+      {showAcceptChanges && <PriceUpdatedBanner onClick={onAcceptChanges} />}
       <AutoColumn
         justify="flex-start"
         gap="sm"
diff --git a/src/modules/trade/pure/PriceUpdatedBanner/index.tsx b/src/modules/trade/pure/PriceUpdatedBanner/index.tsx
new file mode 100644
index 0000000000..d6d0bd4259
--- /dev/null
+++ b/src/modules/trade/pure/PriceUpdatedBanner/index.tsx
@@ -0,0 +1,55 @@
+import React from 'react'
+
+import { Trans } from '@lingui/macro'
+import { transparentize } from 'polished'
+import styled from 'styled-components/macro'
+
+import { InlineBanner } from 'common/pure/InlineBanner'
+
+const Wrapper = styled.div`
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  font-size: 16px;
+  font-weight: 600;
+`
+
+const StyledBanner = styled(InlineBanner)`
+  > span {
+    width: 100%;
+  }
+`
+
+const AcceptButton = styled.button`
+  background: ${({ theme }) => theme.bg2};
+  color: ${({ theme }) => theme.white};
+  cursor: pointer;
+  font-size: 16px;
+  font-weight: 600;
+  border: none;
+  box-shadow: none;
+  outline: none;
+  padding: 10px 20px;
+  border-radius: 8px;
+
+  &:hover {
+    background-color: ${({ theme }) => transparentize(0.2, theme.bg2)};
+  }
+`
+
+export function PriceUpdatedBanner({ onClick }: { onClick(): void }) {
+  return (
+    <StyledBanner>
+      <Wrapper>
+        <div>
+          <Trans>Price Updated</Trans>
+        </div>
+        <div>
+          <AcceptButton onClick={onClick}>
+            <Trans>Accept</Trans>
+          </AcceptButton>
+        </div>
+      </Wrapper>
+    </StyledBanner>
+  )
+}
diff --git a/src/modules/trade/pure/TradeConfirmation/index.tsx b/src/modules/trade/pure/TradeConfirmation/index.tsx
index 94f1176986..8870143e2d 100644
--- a/src/modules/trade/pure/TradeConfirmation/index.tsx
+++ b/src/modules/trade/pure/TradeConfirmation/index.tsx
@@ -1,4 +1,4 @@
-import React from 'react'
+import React, { useCallback, useEffect, useRef, useState } from 'react'
 
 import { Trans } from '@lingui/macro'
 
@@ -12,6 +12,8 @@ import { CurrencyAmountPreview, CurrencyPreviewInfo } from 'common/pure/Currency
 
 import * as styledEl from './styled'
 
+import { PriceUpdatedBanner } from '../PriceUpdatedBanner'
+
 export interface TradeConfirmationProps {
   onConfirm(): void
   onDismiss(): void
@@ -37,6 +39,13 @@ export function TradeConfirmation(props: TradeConfirmationProps) {
     children,
   } = props
 
+  const inputAmount = inputCurrencyInfo.amount?.toExact()
+  const outputAmount = outputCurrencyInfo.amount?.toExact()
+
+  const { isPriceChanged, resetPriceChanged } = useIsPriceChanged(inputAmount, outputAmount)
+
+  const isButtonDisabled = isConfirmDisabled || isPriceChanged
+
   return (
     <styledEl.WidgetWrapper>
       <styledEl.Header>
@@ -60,10 +69,37 @@ export function TradeConfirmation(props: TradeConfirmationProps) {
           priceImpactParams={priceImpact}
         />
         {children}
-        <ButtonPrimary onClick={onConfirm} disabled={isConfirmDisabled} buttonSize={ButtonSize.BIG}>
+        {isPriceChanged && <PriceUpdatedBanner onClick={resetPriceChanged} />}
+        <ButtonPrimary onClick={onConfirm} disabled={isButtonDisabled} buttonSize={ButtonSize.BIG}>
           <Trans>{buttonText}</Trans>
         </ButtonPrimary>
       </styledEl.ContentWrapper>
     </styledEl.WidgetWrapper>
   )
 }
+
+function useIsPriceChanged(inputAmount: string | undefined, outputAmount: string | undefined) {
+  const initialAmounts = useRef<{ inputAmount?: string; outputAmount?: string }>()
+
+  const [isPriceChanged, setIsPriceChanged] = useState(false)
+
+  const resetPriceChanged = useCallback(() => {
+    initialAmounts.current = { inputAmount, outputAmount }
+    setIsPriceChanged(false)
+  }, [inputAmount, outputAmount])
+
+  useEffect(() => {
+    resetPriceChanged()
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [])
+
+  useEffect(() => {
+    if (!initialAmounts.current) return
+
+    if (inputAmount !== initialAmounts.current.inputAmount || outputAmount !== initialAmounts.current.outputAmount) {
+      setIsPriceChanged(true)
+    }
+  }, [inputAmount, outputAmount])
+
+  return { isPriceChanged, resetPriceChanged }
+}

From 18ca77f4f0446e7c9529e8db8f72c37bbd03988c Mon Sep 17 00:00:00 2001
From: Alexandr Kazachenko <shoom3301@gmail.com>
Date: Fri, 30 Jun 2023 07:31:20 -0700
Subject: [PATCH 45/67] fix(twap): disable selecting native token as sell
 currency (#2728)

---
 .../containers/AdvancedOrdersWidget/index.tsx |  2 ++
 .../containers/LimitOrdersWidget/index.tsx    |  2 +-
 .../hooks/useDisableNativeTokenSelling.ts     | 20 ++++++++++---------
 3 files changed, 14 insertions(+), 10 deletions(-)
 rename src/modules/{limitOrders => trade}/hooks/useDisableNativeTokenSelling.ts (68%)

diff --git a/src/modules/advancedOrders/containers/AdvancedOrdersWidget/index.tsx b/src/modules/advancedOrders/containers/AdvancedOrdersWidget/index.tsx
index dbb2ed52c0..e65e2de57c 100644
--- a/src/modules/advancedOrders/containers/AdvancedOrdersWidget/index.tsx
+++ b/src/modules/advancedOrders/containers/AdvancedOrdersWidget/index.tsx
@@ -10,6 +10,7 @@ import {
   useFillAdvancedOrdersDerivedState,
 } from 'modules/advancedOrders/hooks/useAdvancedOrdersDerivedState'
 import { useSetupTradeState, useTradePriceImpact, TradeWidget, TradeWidgetSlots } from 'modules/trade'
+import { useDisableNativeTokenSelling } from 'modules/trade/hooks/useDisableNativeTokenSelling'
 import { useTradeQuote, useSetTradeQuoteParams } from 'modules/tradeQuote'
 import { partsStateAtom } from 'modules/twap/state/partsStateAtom'
 
@@ -18,6 +19,7 @@ import { CurrencyInfo } from 'common/pure/CurrencyInputPanel/types'
 export function AdvancedOrdersWidget({ children }: { children: JSX.Element }) {
   useSetupTradeState()
   useFillAdvancedOrdersDerivedState()
+  useDisableNativeTokenSelling()
 
   const {
     inputCurrency,
diff --git a/src/modules/limitOrders/containers/LimitOrdersWidget/index.tsx b/src/modules/limitOrders/containers/LimitOrdersWidget/index.tsx
index b738d1a63d..8d99d93a4a 100644
--- a/src/modules/limitOrders/containers/LimitOrdersWidget/index.tsx
+++ b/src/modules/limitOrders/containers/LimitOrdersWidget/index.tsx
@@ -9,11 +9,11 @@ import { Field } from 'legacy/state/swap/actions'
 import { LimitOrdersWarnings } from 'modules/limitOrders/containers/LimitOrdersWarnings'
 import { useLimitOrdersWidgetActions } from 'modules/limitOrders/containers/LimitOrdersWidget/hooks/useLimitOrdersWidgetActions'
 import { TradeButtons } from 'modules/limitOrders/containers/TradeButtons'
-import { useDisableNativeTokenSelling } from 'modules/limitOrders/hooks/useDisableNativeTokenSelling'
 import { useSetupLimitOrderAmountsFromUrl } from 'modules/limitOrders/hooks/useSetupLimitOrderAmountsFromUrl'
 import { InfoBanner } from 'modules/limitOrders/pure/InfoBanner'
 import { partiallyFillableOverrideAtom } from 'modules/limitOrders/state/partiallyFillableOverride'
 import { TradeWidget, useSetupTradeState, useTradePriceImpact } from 'modules/trade'
+import { useDisableNativeTokenSelling } from 'modules/trade/hooks/useDisableNativeTokenSelling'
 import { useIsWrapOrUnwrap } from 'modules/trade/hooks/useIsWrapOrUnwrap'
 import { useSetTradeQuoteParams, useTradeQuote } from 'modules/tradeQuote'
 
diff --git a/src/modules/limitOrders/hooks/useDisableNativeTokenSelling.ts b/src/modules/trade/hooks/useDisableNativeTokenSelling.ts
similarity index 68%
rename from src/modules/limitOrders/hooks/useDisableNativeTokenSelling.ts
rename to src/modules/trade/hooks/useDisableNativeTokenSelling.ts
index a6707903e3..3c7e8417d6 100644
--- a/src/modules/limitOrders/hooks/useDisableNativeTokenSelling.ts
+++ b/src/modules/trade/hooks/useDisableNativeTokenSelling.ts
@@ -1,22 +1,24 @@
-import { useAtomValue } from 'jotai/utils'
 import { useEffect } from 'react'
 
 import { NATIVE_CURRENCY_BUY_TOKEN } from 'legacy/constants'
 import { WRAPPED_NATIVE_CURRENCY } from 'legacy/constants/tokens'
 
-import { limitOrdersRawStateAtom } from 'modules/limitOrders/state/limitOrdersRawStateAtom'
-import { useTradeNavigate } from 'modules/trade/hooks/useTradeNavigate'
-import { getDefaultTradeRawState } from 'modules/trade/types/TradeRawState'
 import { useWalletInfo } from 'modules/wallet'
 
+import { useTradeNavigate } from './useTradeNavigate'
+import { useTradeState } from './useTradeState'
+
+import { getDefaultTradeRawState } from '../types/TradeRawState'
+
 /**
- * Since the selling of ETH is not supported in limit orders
+ * Since the selling of ETH is not supported in limit and advanced orders
  * We automatically replace it by WETH
  */
 export function useDisableNativeTokenSelling() {
   const { chainId } = useWalletInfo()
-  const { inputCurrencyId, outputCurrencyId } = useAtomValue(limitOrdersRawStateAtom)
-  const limitOrdersNavigate = useTradeNavigate()
+  const { state } = useTradeState()
+  const { inputCurrencyId, outputCurrencyId } = state || {}
+  const navigate = useTradeNavigate()
 
   useEffect(() => {
     const nativeToken = chainId ? NATIVE_CURRENCY_BUY_TOKEN[chainId] : null
@@ -33,10 +35,10 @@ export function useDisableNativeTokenSelling() {
     const defaultInputCurrencyId = getDefaultTradeRawState(chainId).inputCurrencyId
 
     if (isInputNative && outputCurrencyId && !isOutputWrappedNative) {
-      limitOrdersNavigate(chainId, {
+      navigate(chainId, {
         inputCurrencyId: isInputNative ? defaultInputCurrencyId : inputCurrencyId,
         outputCurrencyId,
       })
     }
-  }, [chainId, inputCurrencyId, outputCurrencyId, limitOrdersNavigate])
+  }, [chainId, inputCurrencyId, outputCurrencyId, navigate])
 }

From c648230fe112d530c8a99120aba20f414af3df46 Mon Sep 17 00:00:00 2001
From: Alexandr Kazachenko <shoom3301@gmail.com>
Date: Fri, 30 Jun 2023 07:31:43 -0700
Subject: [PATCH 46/67] fix(twap): set correct token address when buy asset is
 native (#2727)

---
 src/modules/twap/utils/twapOrderToStruct.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/modules/twap/utils/twapOrderToStruct.ts b/src/modules/twap/utils/twapOrderToStruct.ts
index 3b02aa0503..b9bf124d15 100644
--- a/src/modules/twap/utils/twapOrderToStruct.ts
+++ b/src/modules/twap/utils/twapOrderToStruct.ts
@@ -1,9 +1,13 @@
+import { NATIVE_CURRENCY_BUY_ADDRESS } from 'legacy/constants'
+
 import { TWAPOrder, TWAPOrderStruct } from '../types'
 
 export function twapOrderToStruct(order: TWAPOrder): TWAPOrderStruct {
+  const buyToken = order.buyAmount.currency
+
   return {
     sellToken: order.sellAmount.currency.address,
-    buyToken: order.buyAmount.currency.address,
+    buyToken: buyToken.isNative ? NATIVE_CURRENCY_BUY_ADDRESS : buyToken.address,
     receiver: order.receiver,
     partSellAmount: order.sellAmount.divide(order.numOfParts).quotient.toString(),
     minPartLimit: order.buyAmount.divide(order.numOfParts).quotient.toString(),

From 982cb970730395f97304527d3eb2388712d5165f Mon Sep 17 00:00:00 2001
From: Alexandr Kazachenko <shoom3301@gmail.com>
Date: Fri, 30 Jun 2023 07:32:07 -0700
Subject: [PATCH 47/67] fix: fix popup styles (#2750)

---
 src/legacy/components/Popups/PopupItem.tsx | 14 ++++----
 src/legacy/components/Popups/index.tsx     | 18 ++++++++--
 src/legacy/components/Popups/styled.ts     | 40 ++++++++--------------
 3 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/src/legacy/components/Popups/PopupItem.tsx b/src/legacy/components/Popups/PopupItem.tsx
index bda9448bf1..467f2b4168 100644
--- a/src/legacy/components/Popups/PopupItem.tsx
+++ b/src/legacy/components/Popups/PopupItem.tsx
@@ -8,7 +8,7 @@ import { WarningPopup } from 'legacy/components/Popups/WarningPopup'
 import { useRemovePopup } from 'legacy/state/application/hooks'
 import { PopupContent } from 'legacy/state/application/reducer'
 
-import { AnimatedFader, PopupItemWrapper, PopupWrapper, StyledClose } from './styled'
+import { AnimatedFader, PopupWrapper, StyledClose } from './styled'
 import { TransactionPopup } from './TransactionPopup'
 
 export function PopupItem({
@@ -68,12 +68,10 @@ export function PopupItem({
   })
 
   return (
-    <PopupItemWrapper>
-      <PopupWrapper css={content.styles}>
-        <StyledClose stroke={isUnsupportedNetwork ? theme.black : theme.text2} onClick={removeThisPopup} />
-        {popupContent}
-        {removeAfterMs !== null ? <AnimatedFader style={faderStyle} /> : null}
-      </PopupWrapper>
-    </PopupItemWrapper>
+    <PopupWrapper css={content.styles}>
+      <StyledClose stroke={isUnsupportedNetwork ? theme.black : theme.text2} onClick={removeThisPopup} />
+      {popupContent}
+      {removeAfterMs !== null ? <AnimatedFader style={faderStyle} /> : null}
+    </PopupWrapper>
   )
 }
diff --git a/src/legacy/components/Popups/index.tsx b/src/legacy/components/Popups/index.tsx
index 5332d36975..45cc2d7ff0 100644
--- a/src/legacy/components/Popups/index.tsx
+++ b/src/legacy/components/Popups/index.tsx
@@ -1,3 +1,5 @@
+import { MouseEvent, useCallback, useRef } from 'react'
+
 import { SupportedChainId } from '@cowprotocol/cow-sdk'
 
 import { transparentize } from 'polished'
@@ -5,7 +7,7 @@ import styled from 'styled-components/macro'
 
 import { AutoColumn } from 'legacy/components/Column'
 import { PopupItem } from 'legacy/components/Popups/PopupItem'
-import { useActivePopups } from 'legacy/state/application/hooks'
+import { useActivePopups, useRemovePopup } from 'legacy/state/application/hooks'
 import { useURLWarningVisible } from 'legacy/state/user/hooks'
 import { MEDIA_WIDTHS } from 'legacy/theme'
 
@@ -75,13 +77,23 @@ const FixedPopupColumn = styled(AutoColumn)<{ extraPadding: boolean; xlPadding:
 export function Popups() {
   // get all popups
   const activePopups = useActivePopups()
-
+  const removePopup = useRemovePopup()
   const urlWarningActive = useURLWarningVisible()
+  const mobileBackgroundEl = useRef<HTMLDivElement>(null)
 
   // need extra padding if network is not L1 Ethereum
   const { chainId } = useWalletInfo()
   const isNotOnMainnet = Boolean(chainId && chainId !== SupportedChainId.MAINNET)
 
+  const closeAllPopups = useCallback(
+    (event: MouseEvent) => {
+      if (event.target !== mobileBackgroundEl.current) return
+
+      activePopups.forEach((popup) => removePopup(popup.key))
+    },
+    [activePopups, removePopup]
+  )
+
   return (
     <>
       <FixedPopupColumn gap="20px" extraPadding={urlWarningActive} xlPadding={isNotOnMainnet}>
@@ -90,7 +102,7 @@ export function Popups() {
         ))}
       </FixedPopupColumn>
       <MobilePopupWrapper show={activePopups?.length > 0}>
-        <MobilePopupInner>
+        <MobilePopupInner ref={mobileBackgroundEl} onClick={closeAllPopups}>
           {activePopups // reverse so new items up front
             .slice(0)
             .reverse()
diff --git a/src/legacy/components/Popups/styled.ts b/src/legacy/components/Popups/styled.ts
index 47baad791a..e2c42b455d 100644
--- a/src/legacy/components/Popups/styled.ts
+++ b/src/legacy/components/Popups/styled.ts
@@ -18,32 +18,10 @@ export const PopupWrapper = styled.div<{ css?: FlattenInterpolation<ThemeProps<D
   background-color: ${({ theme }) => theme.bg1};
   position: relative;
   border-radius: 10px;
-  padding: 20px;
-  padding-right: 35px;
+  padding: 20px 35px 20px 20px;
   overflow: hidden;
-
-  ${({ theme }) => theme.mediaWidth.upToSmall`
-    min-width: 290px;
-    &:not(:last-of-type) {
-      margin-right: 20px;
-    }
-  `}
-
-  ${({ css }) => css && css}
-`
-
-export const PopupItemWrapper = styled.div`
-  ${(props) => props.className} {
-    border: 2px solid ${({ theme }) => theme.black};
-    box-shadow: 2px 2px 0 ${({ theme }) => theme.black};
-  }
-
-  ${PopupWrapper} {
-    ${({ theme }) => theme.mediaWidth.upToSmall`
-      margin: 0 0 16px;
-      min-width: 100%;
-    `}
-  }
+  border: 2px solid ${({ theme }) => theme.black};
+  box-shadow: 2px 2px 0 ${({ theme }) => theme.black};
 
   ${Fader} {
     background-color: ${({ theme }) => theme.disabled};
@@ -54,6 +32,18 @@ export const PopupItemWrapper = styled.div`
     text-decoration: underline;
     color: ${({ theme }) => theme.textLink};
   }
+
+  ${({ theme }) => theme.mediaWidth.upToSmall`
+    min-width: 290px;
+    margin: 0 0 16px;
+    min-width: 100%;
+
+    &:not(:last-of-type) {
+      margin-right: 20px;
+    }
+  `}
+
+  ${({ css }) => css && css}
 `
 
 export const StyledClose = styled(X)`

From 694a1121442b140b8b832d0c3d149e480887a2e3 Mon Sep 17 00:00:00 2001
From: fairlight <31534717+fairlighteth@users.noreply.github.com>
Date: Mon, 3 Jul 2023 10:15:58 +0100
Subject: [PATCH 48/67] feat: surplus modal (#2767)

* feat: surplus modal

* Fix code style issues with Prettier

* feat: surplus modal dark mode

* feat: surplus modal order kind

* Fix code style issues with Prettier

* feat: surplus modal

* feat: surplus modal

---------

Co-authored-by: Lint Action <lint-action@samuelmeuli.com>
---
 .../SurplusModal.tsx                          | 180 ++++++++++++++++--
 src/legacy/assets/cow-swap/check-singular.svg |   1 +
 src/legacy/assets/cow-swap/surplus-cow.svg    |   1 +
 .../TransactionConfirmationModal/index.tsx    |   2 +-
 4 files changed, 171 insertions(+), 13 deletions(-)
 create mode 100644 src/legacy/assets/cow-swap/check-singular.svg
 create mode 100644 src/legacy/assets/cow-swap/surplus-cow.svg

diff --git a/src/common/pure/TransactionSubmittedContent/SurplusModal.tsx b/src/common/pure/TransactionSubmittedContent/SurplusModal.tsx
index 9c51d16f27..c820a2c479 100644
--- a/src/common/pure/TransactionSubmittedContent/SurplusModal.tsx
+++ b/src/common/pure/TransactionSubmittedContent/SurplusModal.tsx
@@ -1,5 +1,15 @@
+import React, { useCallback } from 'react'
+
 import { OrderKind } from '@cowprotocol/cow-sdk'
 
+import { transparentize } from 'polished'
+import SVG from 'react-inlinesvg'
+import styled from 'styled-components/macro'
+
+import CheckSingular from 'legacy/assets/cow-swap/check-singular.svg'
+import SurplusCow from 'legacy/assets/cow-swap/surplus-cow.svg'
+import twitterImage from 'legacy/assets/cow-swap/twitter.svg'
+import { sendEvent } from 'legacy/components/analytics'
 import { Order } from 'legacy/state/orders/actions'
 import { ExternalLink } from 'legacy/theme'
 
@@ -10,6 +20,131 @@ import { TokenAmount } from 'common/pure/TokenAmount'
 const SELL_SURPLUS_WORD = 'got'
 const BUY_SURPLUS_WORD = 'saved'
 
+function getTwitterText(surplusAmount: string, surplusToken: string, orderKind: OrderKind) {
+  const actionWord = orderKind === OrderKind.SELL ? SELL_SURPLUS_WORD : BUY_SURPLUS_WORD
+  const surplus = `${surplusAmount} ${surplusToken}`
+  return encodeURIComponent(`Hey, I just ${actionWord} ${surplus} on @CoWSwap! 🐮💸\n\nStart swapping on swap.cow.fi`)
+}
+
+export const Wrapper = styled.div`
+  --borderRadius: 16px;
+  display: flex;
+  flex-flow: column wrap;
+  align-items: space-between;
+  justify-content: flex-start;
+  border-radius: var(--borderRadius);
+  position: relative;
+  width: 100%;
+
+  &::before {
+    content: '';
+    position: absolute;
+    left: -16px;
+    top: -60px;
+    width: calc(100% + 32px);
+    height: 170px;
+    background: ${({ theme }) => transparentize(0.9, theme.success)};
+    z-index: -1;
+  }
+
+  > h2 {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 15px;
+    width: 100%;
+    font-weight: 600;
+    line-height: 1;
+    text-align: center;
+    position: absolute;
+    top: -54px;
+    color: ${({ theme }) => theme.success};
+
+    > svg {
+      --size: 28px;
+      width: var(--size);
+      height: var(--size);
+      background: ${({ theme }) => theme.bg1};
+      border-radius: 50%;
+      width: var(--size);
+      height: var(--size);
+      object-fit: contain;
+      margin: 0 10px 0 0;
+      padding: 6px;
+
+      > path {
+        fill: ${({ theme }) => theme.success};
+      }
+    }
+  }
+
+  > span {
+    width: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin: 0 auto;
+  }
+
+  > span > img {
+    --size: 190px;
+    width: var(--size);
+    height: var(--size);
+    margin: 0 auto;
+    object-fit: contain;
+  }
+
+  > h3 {
+    font-size: 20px;
+    line-height: 1.2;
+    margin: 24px auto 4px;
+    font-weight: 300;
+  }
+
+  > strong {
+    font-size: 34px;
+    width: 100%;
+    display: block;
+    padding: 0 24px;
+    text-align: center;
+
+    > span {
+      word-break: break-all;
+      white-space: pre-wrap;
+      display: contents;
+    }
+  }
+
+  > p {
+    font-size: 14px;
+    display: block;
+    text-align: center;
+    width: 70%;
+    margin: 34px auto;
+    padding: 0;
+    color: ${({ theme }) => theme.text2};
+  }
+`
+
+const StyledExternalLink = styled(ExternalLink)`
+  border-radius: 24px;
+  background: ${({ theme }) => theme.bg2};
+  color: ${({ theme }) => theme.white};
+  display: flex;
+  padding: 1rem 2rem;
+  width: fit-content;
+  margin: 1.6rem auto 0;
+  gap: 0.6rem;
+  align-items: center;
+  justify-content: center;
+  transition: transform 0.3s ease-in-out;
+
+  &:hover {
+    text-decoration: none;
+    transform: scale(1.03);
+  }
+`
+
 export type SurplusModalProps = {
   order: Order | undefined
 }
@@ -19,6 +154,13 @@ export function SurplusModal(props: SurplusModalProps) {
 
   const { surplusFiatValue, showFiatValue, surplusToken, surplusAmount } = useGetSurplusData(order)
 
+  const onTweetShare = useCallback(() => {
+    sendEvent({
+      category: 'Surplus Modal',
+      action: 'Share on Twitter',
+    })
+  }, [])
+
   if (!order) {
     return null
   }
@@ -26,23 +168,37 @@ export function SurplusModal(props: SurplusModalProps) {
   const surplusMsg = `You ${order.kind === OrderKind.SELL ? SELL_SURPLUS_WORD : BUY_SURPLUS_WORD} an extra`
 
   return (
-    <div style={{ display: 'flex', flexDirection: 'column', alignItems: 'center' }}>
-      <h2>Swap completed</h2>
-      {/* TODO: add image */}
-      <span>--nice image here--</span>
-      <span>Great! {surplusMsg}</span>
+    <Wrapper>
+      <h2>
+        <SVG src={CheckSingular} title="check" /> Swap completed
+      </h2>
+      <span>
+        <img src={SurplusCow} alt="surplus cow" />
+      </span>
+      <h3>Great! {surplusMsg}</h3>
       <strong>
-        <TokenAmount amount={surplusAmount} tokenSymbol={surplusToken} />!
+        <TokenAmount amount={surplusAmount} tokenSymbol={surplusToken} />
+        <span>!</span>
       </strong>
       {showFiatValue && <FiatAmount amount={surplusFiatValue} accurate={false} />}
-      {/* TODO: add twitter button with styles */}
       {/* TODO: add share data */}
-      <ExternalLink href="https://cow.fi">Share this win!</ExternalLink>
-      {/* TODO: add proper link */}
-      <span>
+      {surplusAmount && surplusToken && (
+        <StyledExternalLink
+          onClickOptional={onTweetShare}
+          href={`https://twitter.com/intent/tweet?text=${getTwitterText(
+            surplusAmount.toSignificant(),
+            surplusToken.symbol || 'Unknown token',
+            order.kind
+          )}`}
+        >
+          <SVG src={twitterImage} description="Twitter" />
+          <span>Share this win!</span>
+        </StyledExternalLink>
+      )}
+      <p>
         CoW Swap is the only token exchange that gets you extra tokens.{' '}
         <ExternalLink href={'https://cow.fi'}>Learn how ↗</ExternalLink>
-      </span>
-    </div>
+      </p>
+    </Wrapper>
   )
 }
diff --git a/src/legacy/assets/cow-swap/check-singular.svg b/src/legacy/assets/cow-swap/check-singular.svg
new file mode 100644
index 0000000000..e89d6dfade
--- /dev/null
+++ b/src/legacy/assets/cow-swap/check-singular.svg
@@ -0,0 +1 @@
+<svg fill="none" viewBox="0 0 17 13" xmlns="http://www.w3.org/2000/svg"><path clip-rule="evenodd" d="m15.7017.544434c.5851.586386.5842 1.536136-.0022 2.121316l-10.00813 9.98755-5.050712-4.95759c-.5912095-.58031-.6000439-1.53002-.019732-2.12123.580314-.59121 1.530014-.60005 2.121224-.01973l2.93175 2.8777 7.9064-7.890196c.5864-.5851838 1.5362-.5842078 2.1214.00218z" fill="#357833" fill-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/src/legacy/assets/cow-swap/surplus-cow.svg b/src/legacy/assets/cow-swap/surplus-cow.svg
new file mode 100644
index 0000000000..14bb3f9984
--- /dev/null
+++ b/src/legacy/assets/cow-swap/surplus-cow.svg
@@ -0,0 +1 @@
+<svg fill="none" viewBox="0 0 190 190" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><radialGradient id="a" cx="0" cy="0" gradientTransform="matrix(190.00029921 -190.00029921 190.00029921 190.00029921 .000488 190)" gradientUnits="userSpaceOnUse" r="1"><stop offset="0" stop-color="#fed4c9"/><stop offset=".171003" stop-color="#f8dbf4"/><stop offset=".450696" stop-color="#d8dbff"/><stop offset=".656105" stop-color="#c4ddff"/><stop offset="1" stop-color="#cae9ff"/></radialGradient><circle cx="152" cy="3" fill="#fff" r="3"/><path d="m190 95c0 52.467-42.532 95-94.9995 95-52.4671 0-95.00001172-42.533-95.00001172-95 0-52.4671 42.53291172-95 95.00001172-95 52.4675 0 94.9995 42.5329 94.9995 95z" fill="url(#a)"/><path d="m36.8894 106 4.9777 8.491-17.6564 10.17-3.2107-9.411z" fill="#fff"/><path d="m153.111 106-4.978 8.491 17.657 10.17 3.21-9.411z" fill="#fff"/><g fill="#052b65"><path d="m150.684 169.494c-15.523 11.623-34.799 18.506-55.6833 18.506-20.8842 0-40.1606-6.884-55.6839-18.506l-15.1054-44.833 17.6564-10.17 17.9029 31.008 6.23-13.499h58.0003l6.23 13.498 17.902-31.007 17.657 10.17z"/><path d="m70.9995 72c0-2.2091 1.7909-4 4-4 2.2092 0 4 1.7909 4 4v4h-8z"/><path d="m119 72c0-2.2091-1.791-4-4-4s-4 1.7909-4 4v4h8z"/><path d="m41 77c0-.5523.4477-1 1-1h37v23h-20c-9.9411 0-18-8.0589-18-18z"/><path d="m149 77c0-.5523-.448-1-1-1h-37v23h20c9.941 0 18-8.0589 18-18z"/><path d="m55.0005 96.0005h79.9995l-11 35.9995h-57.9995z"/></g><path clip-rule="evenodd" d="m66.7414 95.9114c-.5477 1.9846-.7414 4.4356-.7414 6.0886h-3c0-1.825.2063-4.5917.8586-6.9549.3241-1.1742.7896-2.3673 1.481-3.2977.7123-.9585 1.7588-1.7474 3.1604-1.7474s2.4481.7889 3.1604 1.7474c.6914.9304 1.1569 2.1235 1.481 3.2977.6523 2.3632.8586 5.1299.8586 6.9549h-3c0-1.653-.1937-4.104-.7414-6.0886-.2759-.9997-.6104-1.7631-.969-2.2458-.3377-.4545-.5912-.5352-.7896-.5352s-.4519.0807-.7896.5352c-.3586.4827-.6931 1.2461-.969 2.2458z" fill="#fff" fill-rule="evenodd"/><path d="m79 76h32v35.146c0 6.547-5.307 11.854-11.8536 11.854h-8.2928c-6.5466 0-11.8536-5.307-11.8536-11.854z" fill="#fff"/><path clip-rule="evenodd" d="m123.259 95.9119c.547 1.9846.741 4.4351.741 6.0881h3c0-1.824-.206-4.5912-.859-6.9544-.324-1.1742-.789-2.3673-1.481-3.2977-.712-.9585-1.758-1.7474-3.16-1.7474s-2.448.7889-3.16 1.7474c-.692.9304-1.157 2.1235-1.481 3.2977-.653 2.3632-.859 5.1304-.859 6.9544h3c0-1.653.194-4.1035.741-6.0881.276-.9997.611-1.7632.969-2.2458.338-.4545.592-.5352.79-.5352s.452.0807.79.5352c.358.4826.693 1.2461.969 2.2458z" fill="#fff" fill-rule="evenodd"/><path d="m126.769 138h-63.538l2.7692-6h57.9998z" fill="#357833"/><path d="m90.485 14h6v12h-6z" fill="#ff83a8" transform="matrix(.70710678 .70710678 -.70710678 .70710678 36.402055 -59.882335)"/><path d="m172 88h6v12h-6z" fill="#ff83a8" transform="matrix(.8660254 .5 -.5 .8660254 67.043631 -74.210236)"/><path d="m73.361 53.657h6v12h-6z" fill="#357833" transform="matrix(.25881905 .96592583 -.96592583 .25881905 106.202874 -31.09188)"/><circle cx="137" cy="54" fill="#357833" r="4"/><path d="m21.91 99.3015c-.2487.9315-1.5703.9315-1.819 0l-1.2064-4.5189c-.3476-1.3021-1.3646-2.3191-2.6667-2.6667l-4.5189-1.2064c-.9314-.2487-.9314-1.5703 0-1.819l4.5189-1.2064c1.3021-.3476 2.3191-1.3646 2.6667-2.6667l1.2064-4.5189c.2487-.9313 1.5703-.9313 1.819 0l1.2064 4.5189c.3476 1.3021 1.3646 2.3191 2.6667 2.6667l4.5189 1.2064c.9313.2487.9313 1.5703 0 1.819l-4.5189 1.2064c-1.3021.3476-2.3191 1.3646-2.6667 2.6667z" fill="#fff" opacity=".5"/><path d="m165.455 70.6507c-.125.4657-.785.4657-.91 0l-.603-2.2594c-.174-.651-.682-1.1595-1.333-1.3333l-2.26-.6033c-.465-.1243-.465-.7851 0-.9094l2.26-.6033c.651-.1738 1.159-.6823 1.333-1.3333l.603-2.2594c.125-.4657.785-.4657.91 0l.603 2.2594c.174.651.682 1.1595 1.333 1.3333l2.26.6033c.465.1243.465.7851 0 .9094l-2.26.6033c-.651.1738-1.159.6823-1.333 1.3333z" fill="#fff" opacity=".5"/><path d="m120.182 32.4761c-.187.6985-1.178.6985-1.365 0l-.904-3.3891c-.261-.9766-1.024-1.7394-2-2.0001l-3.39-.9048c-.698-.1865-.698-1.1777 0-1.3642l3.39-.9048c.976-.2607 1.739-1.0235 2-2.0001l.904-3.3891c.187-.6985 1.178-.6985 1.365 0l.904 3.3891c.261.9766 1.024 1.7394 2 2.0001l3.39.9048c.698.1865.698 1.1777 0 1.3642l-3.39.9048c-.976.2607-1.739 1.0235-2 2.0001z" fill="#fff" opacity=".5"/><path clip-rule="evenodd" d="m95.0005 188c51.3625 0 92.9995-41.638 92.9995-93 0-51.3625-41.637-93-92.9995-93s-93.00001 41.6375-93.00001 93c0 51.362 41.63751 93 93.00001 93zm0 2c52.4675 0 94.9995-42.533 94.9995-95 0-52.4671-42.532-95-94.9995-95-52.4671 0-95.00001172 42.5329-95.00001172 95 0 52.467 42.53291172 95 95.00001172 95z" fill="#fff" fill-rule="evenodd"/><path d="m25.187 58.5117-5.6421 9.7723-19.54465378-11.2841 5.64207378-9.7724z" fill="#ff83a8"/><path clip-rule="evenodd" d="m92.9998 132h4v3.203c3.7852.777 6.8522 3.719 7.6992 7.614l3.301 15.183h-8.0006c0 2.761-2.2386 5-5 5s-5-2.239-5-5h-7.9999l3.3006-15.183c.8469-3.895 3.9145-6.838 7.6997-7.614z" fill="#ffcf56" fill-rule="evenodd"/><path d="m75 111c0-5.523 4.4772-10 10-10h20c5.523 0 10 4.477 10 10v7c0 5.523-4.477 10-10 10h-20c-5.5228 0-10-4.477-10-10z" fill="#ff83a8"/><path d="m98 112.136c0-2.284 2.015-4.136 4.5-4.136s4.5 1.852 4.5 4.136v4.728c0 2.284-2.015 4.136-4.5 4.136s-4.5-1.852-4.5-4.136z" fill="#052b65"/><path d="m82.9995 112.136c0-2.284 2.0147-4.136 4.5-4.136s4.5 1.852 4.5 4.136v4.728c0 2.284-2.0147 4.136-4.5 4.136s-4.5-1.852-4.5-4.136z" fill="#052b65"/><path d="m183.327 29.0376c3.872 6.7069-.238 16.3294-9.181 21.4924-8.942 5.163-19.331 3.9114-23.203-2.7956l-3.506-6.0719c-3.872-6.707.238-16.3295 9.181-21.4925s19.331-3.9114 23.203 2.7956z" fill="#ffcf56"/><path clip-rule="evenodd" d="m147.939 30.6435c-1.589 3.7198-1.613 7.5362.173 10.6297 2.377 4.1165 7.49 6.1095 13.305 5.472 2.899-.3178 5.941-1.2909 8.834-2.9616 4.34-2.5054 7.48-6.0786 9.069-9.7986 1.589-3.7197 1.613-7.5362-.173-10.6297s-5.103-4.9812-9.119-5.465c-4.016-.4839-8.681.4493-13.02 2.9547-4.34 2.5053-7.48 6.0785-9.069 9.7985zm34.118-2.2477c.024 2.0536-.434 4.1639-1.304 6.2012-.514 1.2041-1.174 2.387-1.968 3.5249l2.639 4.5665c.553-.8603 1.022-1.7417 1.402-2.6314 1.589-3.7197 1.612-7.5362-.174-10.6297zm-1.622 15.694-2.67-4.6202c-1.623 1.9801-3.667 3.7818-6.066 5.2638l2.726 4.722c2.431-1.5081 4.457-3.3556 6.01-5.3656zm-7.359 6.1446-2.726-4.722c-2.486 1.3378-5.069 2.2066-7.594 2.6214l2.668 4.622c2.518-.3398 5.131-1.1703 7.652-2.5214zm-9.36 2.6778-2.638-4.5686c-3.703.3164-7.246-.364-10.055-2.0279l.595 1.0295c1.786 3.0935 5.103 4.9812 9.119 5.4651.96.1157 1.957.1503 2.979.1019zm16.78-30.3359 3.506 6.072c2.086 3.6134 1.991 7.9617.257 12.0207-1.734 4.0587-5.12 7.8783-9.723 10.5359s-9.604 3.6802-13.986 3.1522c-4.382-.5279-8.195-2.6194-10.282-6.2329l-3.505-6.072c-2.086-3.6134-1.991-7.9617-.257-12.0207 1.734-4.0587 5.119-7.8782 9.723-10.5359 4.603-2.6576 9.604-3.6801 13.985-3.1522 4.382.5279 8.196 2.6195 10.282 6.2329z" fill="#fff" fill-rule="evenodd"/><path d="m22.0396 35.4754c7.7454-9.385 17.2583-17.2573 28.029-23.1072.6117.5494 1.2168 1.1225 1.8131 1.7188 9.4312 9.4313 13.084 21.0694 8.1588 25.9946l-8.0548 8.0548c-3.2895 3.2895-9.5734 2.7526-16.1943-.7767-3.2924-1.755-6.668-4.2499-9.8003-7.3821-1.4589-1.459-2.7795-2.9707-3.9515-4.5022z" fill="#ffcf56"/><path clip-rule="evenodd" d="m50.2516 11.269.4092.3675c.622.5587 1.2373 1.1415 1.8434 1.7476 4.786 4.786 8.1343 10.1581 9.6555 15.0046 1.5085 4.8062 1.2744 9.3206-1.4967 12.0917l-8.0548 8.0548c-1.8496 1.8496-4.4898 2.5682-7.4442 2.3955-2.9528-.1726-6.2891-1.2348-9.6674-3.0356-3.3654-1.794-6.8024-4.3364-9.9847-7.5188-1.4828-1.4828-2.8262-3.0204-4.0194-4.5795l-.3763-.4918.3942-.4776c7.8084-9.4613 17.3989-17.3979 28.258-23.2959zm9.3097 28.1097c2.1541-2.1541 2.5562-5.9214 1.1118-10.5234-1.4318-4.5617-4.6254-9.7243-9.2707-14.3695-.4537-.4537-.9125-.8938-1.3755-1.3198-6.9335 3.8188-13.3347 8.4856-19.0638 13.8606 1.1061 1.4247 2.344 2.8319 3.7054 4.1932 3.0821 3.0822 6.3965 5.5295 9.6158 7.2455 3.2426 1.7285 6.3587 2.6993 9.0255 2.8552 2.6652.1557 4.8117-.502 6.2515-1.9418zm-29.7312-11.2713c-2.363 2.2914-4.6063 4.7056-6.7197 7.2323.9022 1.1439 1.8894 2.2752 2.957 3.3794l6.953-6.9529c-1.1548-1.193-2.2201-2.4182-3.1903-3.6588zm4.292 4.7605-6.953 6.953c2.7603 2.6689 5.6883 4.8328 8.5548 6.4241l6.9109-6.9109c-2.8742-1.6422-5.7789-3.82-8.5127-6.4662zm9.9421 7.2402c3.2024 1.6382 6.3514 2.604 9.1547 2.7678 1.05.0614 2.0603.0101 3.0096-.1644l-4.722 4.722c-1.4399 1.4399-3.5863 2.0976-6.2516 1.9418-2.4078-.1407-5.1819-.9458-8.0847-2.3731z" fill="#fff" fill-rule="evenodd"/><path d="m102.202 59.466-3.3055-3.3052c-1.6312-1.6312-1.8368-4.2739-.7876-6.8471.5163-1.2662 1.3365-2.5156 2.4401-3.6193 1.104-1.1037 2.353-1.9238 3.619-2.4402 2.574-1.0492 5.216-.8435 6.847.7876l3.306 3.3052c2.434 2.4339 1.694 7.1198-1.653 10.4664s-8.032 4.0864-10.466 1.6526z" fill="#ffcf56"/><path clip-rule="evenodd" d="m114.893 52.1164c.271-1.7155-.126-3.2213-1.123-4.2185-1.332-1.332-3.602-1.5957-6.002-.6171-1.166.4756-2.329 1.2365-3.363 2.2697-1.033 1.0332-1.794 2.1961-2.269 3.3625-.979 2.4-.715 4.6702.617 6.0021.997.9973 2.503 1.3936 4.218 1.1227 1.715-.2707 3.577-1.2058 5.147-2.7753 1.569-1.5695 2.504-3.4315 2.775-5.1461zm-14.89 4.0489c-.0641-1.0889.115-2.2353.505-3.3512l-2.0555-2.0553c-.4872 1.9588-.1213 3.7346.9952 4.8511zm-.966-7.0255 2.146 2.1458c.422-.7872.953-1.5524 1.587-2.2691l-2.201-2.2011c-.6415.738-1.1535 1.5264-1.532 2.3244zm2.633-3.4261 2.201 2.201c.717-.6337 1.482-1.1646 2.27-1.5869l-2.146-2.1458c-.798.3785-1.587.8905-2.325 1.5317zm3.944-2.1162 2.055 2.0554c1.116-.3895 2.262-.569 3.351-.5048l-.555-.5554c-1.117-1.1165-2.892-1.4824-4.851-.9952zm-3.963 16.4193-3.305-3.3051c-1.9304-1.9304-2.078-4.9458-.9581-7.6921.5569-1.366 1.4365-2.7018 2.6107-3.876 1.1744-1.1742 2.5104-2.0537 3.8764-2.6107 2.746-1.1198 5.761-.9723 7.692.9581l3.305 3.3051c1.436 1.4366 1.887 3.4908 1.56 5.5633-.328 2.0735-1.436 4.2278-3.213 6.0049-1.777 1.777-3.931 2.8852-6.005 3.2125-2.072.3273-4.126-.1234-5.563-1.56z" fill="#fff" fill-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/src/legacy/components/TransactionConfirmationModal/index.tsx b/src/legacy/components/TransactionConfirmationModal/index.tsx
index 091cf91f5d..e53d520741 100644
--- a/src/legacy/components/TransactionConfirmationModal/index.tsx
+++ b/src/legacy/components/TransactionConfirmationModal/index.tsx
@@ -81,7 +81,7 @@ export function TransactionConfirmationModal({
 
 function getWidth(hash: string | undefined, activityDerivedState: ActivityDerivedState | null): number {
   if (activityDerivedState && getActivityState(activityDerivedState) === 'filled') {
-    return 400
+    return 470
   }
   if (hash) {
     return 850

From c7a14ce47ea06301507430608b402ae1b5f8a2b7 Mon Sep 17 00:00:00 2001
From: fairlight <31534717+fairlighteth@users.noreply.github.com>
Date: Tue, 4 Jul 2023 07:12:48 +0100
Subject: [PATCH 49/67] feat(twap): styling and tooltip/labels (#2600)

---
 .../pure/CurrencyArrowSeparator/styled.tsx    |  4 +-
 .../QuestionHelper/QuestionHelperMod.tsx      |  4 +-
 .../components/QuestionHelper/index.tsx       | 13 +++-
 src/legacy/components/Tooltip/index.tsx       |  7 ++
 .../trade/containers/TradeWidget/styled.tsx   |  6 +-
 src/modules/trade/pure/TradeSelect/index.tsx  |  4 +-
 src/modules/trade/pure/TradeTextBox/index.tsx |  3 +
 .../trade/pure/TradeWidgetField/index.tsx     | 13 +++-
 .../trade/pure/TradeWidgetField/styled.tsx    |  6 +-
 .../twap/containers/TwapFormWidget/index.tsx  | 28 ++++---
 .../twap/containers/TwapFormWidget/styled.tsx | 17 ++--
 .../containers/TwapFormWidget/tooltips.tsx    | 77 +++++++++++++++++++
 src/modules/twap/pure/AmountParts/index.tsx   | 26 +++++--
 src/modules/twap/pure/AmountParts/styled.tsx  | 19 ++++-
 .../twap/pure/DeadlineSelector/index.tsx      | 21 ++++-
 15 files changed, 205 insertions(+), 43 deletions(-)
 create mode 100644 src/modules/twap/containers/TwapFormWidget/tooltips.tsx

diff --git a/src/common/pure/CurrencyArrowSeparator/styled.tsx b/src/common/pure/CurrencyArrowSeparator/styled.tsx
index eb953f290f..580d59cca5 100644
--- a/src/common/pure/CurrencyArrowSeparator/styled.tsx
+++ b/src/common/pure/CurrencyArrowSeparator/styled.tsx
@@ -20,8 +20,8 @@ export const Box = styled.div<{ withRecipient: boolean; isCollapsed: boolean; ha
       &::before {
         content: ${withRecipient ? 'none' : '""'};
         position: absolute;
-        width: calc(100% + 20px);
-        left: -10px;
+        width: calc(100% + 16px);
+        left: -8px;
         top: calc(50% - 1px);
         height: 1px;
         background: ${theme.grey1};
diff --git a/src/legacy/components/QuestionHelper/QuestionHelperMod.tsx b/src/legacy/components/QuestionHelper/QuestionHelperMod.tsx
index 9840c4587e..de88370b2f 100644
--- a/src/legacy/components/QuestionHelper/QuestionHelperMod.tsx
+++ b/src/legacy/components/QuestionHelper/QuestionHelperMod.tsx
@@ -2,7 +2,7 @@ import { useCallback, useState } from 'react'
 
 import styled from 'styled-components/macro'
 
-import Tooltip from 'legacy/components/Tooltip'
+import Tooltip, { renderTooltip } from 'legacy/components/Tooltip'
 import { TooltipProps } from 'legacy/components/Tooltip'
 
 import { QuestionWrapper } from './index'
@@ -66,7 +66,7 @@ export default function QuestionHelper({ text, className, QuestionMark, ...toolt
 
   const content = (
     <div onMouseEnter={open} onMouseLeave={close}>
-      {text}
+      {renderTooltip(text, tooltipProps)}
     </div>
   )
 
diff --git a/src/legacy/components/QuestionHelper/index.tsx b/src/legacy/components/QuestionHelper/index.tsx
index de5d4eb818..ddb73d7b88 100644
--- a/src/legacy/components/QuestionHelper/index.tsx
+++ b/src/legacy/components/QuestionHelper/index.tsx
@@ -1,7 +1,10 @@
+import { ReactNode } from 'react'
+
 import SVG from 'react-inlinesvg'
 import styled from 'styled-components/macro'
 
 import QuestionImage from 'legacy/assets/svg/question.svg'
+import { renderTooltip } from 'legacy/components/Tooltip'
 
 import QuestionHelperMod, { QuestionHelperProps } from './QuestionHelperMod'
 
@@ -25,6 +28,12 @@ export const QuestionWrapper = styled.div`
   }
 `
 
-export default function QuestionHelper(props: Omit<QuestionHelperProps, 'QuestionMark'>) {
-  return <QuestionHelperMod {...props} QuestionMark={QuestionMark} />
+interface EnhancedQuestionHelperProps extends Omit<QuestionHelperProps, 'QuestionMark'> {
+  text: ReactNode
+}
+
+export default function QuestionHelper({ text, ...props }: EnhancedQuestionHelperProps) {
+  const tooltip = renderTooltip(text, props)
+
+  return <QuestionHelperMod {...props} text={tooltip} QuestionMark={QuestionMark} />
 }
diff --git a/src/legacy/components/Tooltip/index.tsx b/src/legacy/components/Tooltip/index.tsx
index 102a5c753f..c93f8b714f 100644
--- a/src/legacy/components/Tooltip/index.tsx
+++ b/src/legacy/components/Tooltip/index.tsx
@@ -65,3 +65,10 @@ export function MouseoverTooltipContent({
     </TooltipContent>
   )
 }
+
+export function renderTooltip(tooltip: ReactNode | ((params?: any) => ReactNode), params?: any): ReactNode {
+  if (typeof tooltip === 'function') {
+    return tooltip(params)
+  }
+  return tooltip
+}
diff --git a/src/modules/trade/containers/TradeWidget/styled.tsx b/src/modules/trade/containers/TradeWidget/styled.tsx
index 262ceae829..327c7ef738 100644
--- a/src/modules/trade/containers/TradeWidget/styled.tsx
+++ b/src/modules/trade/containers/TradeWidget/styled.tsx
@@ -11,19 +11,19 @@ export const Container = styled.div`
 export const ContainerBox = styled.div`
   display: flex;
   flex-flow: column wrap;
-  gap: 6px;
+  gap: 8px;
   background: ${({ theme }) => theme.bg1};
   border: none;
   border-radius: 16px;
   box-shadow: ${({ theme }) => theme.boxShadow1};
-  padding: 10px;
+  padding: 8px;
 `
 
 export const Header = styled.div`
   display: flex;
   justify-content: space-between;
   align-items: center;
-  padding: 4px 4px 10px 8px;
+  padding: 4px 4px 4px 8px;
   margin: 0;
   font-weight: 500;
   font-size: 16px;
diff --git a/src/modules/trade/pure/TradeSelect/index.tsx b/src/modules/trade/pure/TradeSelect/index.tsx
index 1546a75e20..456768ff18 100644
--- a/src/modules/trade/pure/TradeSelect/index.tsx
+++ b/src/modules/trade/pure/TradeSelect/index.tsx
@@ -35,8 +35,10 @@ const StyledMenuButton = styled(MenuButton)`
   font-size: 18px;
   display: flex;
   align-items: center;
-  gap: 8px;
+  flex-flow: row wrap;
   cursor: pointer;
+  width: 100%;
+  justify-content: space-between;
   color: ${({ theme }) => theme.text1};
 `
 
diff --git a/src/modules/trade/pure/TradeTextBox/index.tsx b/src/modules/trade/pure/TradeTextBox/index.tsx
index 7859d5c293..7713ddf16c 100644
--- a/src/modules/trade/pure/TradeTextBox/index.tsx
+++ b/src/modules/trade/pure/TradeTextBox/index.tsx
@@ -5,6 +5,9 @@ import { TradeWidgetField, TradeWidgetFieldProps } from '../TradeWidgetField'
 const StyledTradeWidgetField = styled(TradeWidgetField)`
   background-color: ${({ theme }) => theme.bg1};
   border: 1px solid ${({ theme }) => theme.grey1};
+  display: flex;
+  flex-flow: column wrap;
+  align-items: flex-start;
 `
 
 export function TradeTextBox(props: TradeWidgetFieldProps) {
diff --git a/src/modules/trade/pure/TradeWidgetField/index.tsx b/src/modules/trade/pure/TradeWidgetField/index.tsx
index 357f7fe2b4..6885e8da06 100644
--- a/src/modules/trade/pure/TradeWidgetField/index.tsx
+++ b/src/modules/trade/pure/TradeWidgetField/index.tsx
@@ -1,26 +1,31 @@
+import React from 'react'
+
 import { Trans } from '@lingui/macro'
 
 import QuestionHelper from 'legacy/components/QuestionHelper'
+import { renderTooltip } from 'legacy/components/Tooltip'
 
 import { TradeWidgetFieldBox, TradeWidgetFieldLabel, Content, ErrorText } from './styled'
 
 export type TradeWidgetFieldError = { type: 'error' | 'warning'; text: string | null } | null
 
 export interface TradeWidgetFieldProps {
-  label: string
+  label: React.ReactNode
   children?: JSX.Element
-  hint?: JSX.Element | string
+  tooltip?: React.ReactNode | ((params: any) => React.ReactNode)
   error?: TradeWidgetFieldError
   className?: string
 }
 
 export function TradeWidgetField(props: TradeWidgetFieldProps) {
-  const { className, children, label, hint, error } = props
+  const { className, children, label, tooltip, error } = props
+  const tooltipElement = renderTooltip(tooltip, props)
+
   return (
     <TradeWidgetFieldBox className={className}>
       <TradeWidgetFieldLabel>
         <Trans>{label}</Trans>
-        {hint && <QuestionHelper text={hint} />}
+        {tooltip && <QuestionHelper text={tooltipElement} />}
       </TradeWidgetFieldLabel>
       <Content>{children}</Content>
       {error && <ErrorText type={error.type}>{error.text}</ErrorText>}
diff --git a/src/modules/trade/pure/TradeWidgetField/styled.tsx b/src/modules/trade/pure/TradeWidgetField/styled.tsx
index f6419e4e68..40943d2d19 100644
--- a/src/modules/trade/pure/TradeWidgetField/styled.tsx
+++ b/src/modules/trade/pure/TradeWidgetField/styled.tsx
@@ -4,12 +4,15 @@ import styled from 'styled-components/macro'
 export const TradeWidgetFieldBox = styled.div`
   background: ${({ theme }) => theme.grey1};
   border-radius: 16px;
-  padding: 0.5rem 1rem;
+  min-height: 58px;
+  font-size: 18px;
+  padding: 16px;
   display: flex;
   justify-content: space-between;
   align-items: center;
   flex-flow: row wrap;
   flex: 1;
+  gap: 3px;
 `
 
 export const TradeWidgetFieldLabel = styled.span`
@@ -23,6 +26,7 @@ export const TradeWidgetFieldLabel = styled.span`
 export const Content = styled.div`
   display: flex;
   align-items: center;
+  font-weight: 500;
 `
 
 export const ErrorText = styled.div<{ type?: 'error' | 'warning' }>`
diff --git a/src/modules/twap/containers/TwapFormWidget/index.tsx b/src/modules/twap/containers/TwapFormWidget/index.tsx
index ffe08a29b9..2824e2d331 100644
--- a/src/modules/twap/containers/TwapFormWidget/index.tsx
+++ b/src/modules/twap/containers/TwapFormWidget/index.tsx
@@ -2,6 +2,8 @@ import { useAtomValue } from 'jotai'
 import { useUpdateAtom } from 'jotai/utils'
 import { useEffect } from 'react'
 
+import { renderTooltip } from 'legacy/components/Tooltip'
+
 import { useAdvancedOrdersDerivedState, useAdvancedOrdersRawState } from 'modules/advancedOrders'
 import { useComposableCowContract } from 'modules/advancedOrders/hooks/useComposableCowContract'
 import { useIsWrapOrUnwrap } from 'modules/trade/hooks/useIsWrapOrUnwrap'
@@ -15,6 +17,7 @@ import { useIsSafeApp, useWalletInfo } from 'modules/wallet'
 import { useRateInfoParams } from 'common/hooks/useRateInfoParams'
 
 import * as styledEl from './styled'
+import { AMOUNT_PARTS_LABELS, LABELS_TOOLTIPS } from './tooltips'
 
 import { DEFAULT_TWAP_SLIPPAGE, defaultNumOfParts, orderDeadlines } from '../../const'
 import { useFallbackHandlerVerification } from '../../hooks/useFallbackHandlerVerification'
@@ -32,6 +35,8 @@ import { ActionButtons } from '../ActionButtons'
 import { TwapConfirmModal } from '../TwapConfirmModal'
 import { TwapFormWarnings } from '../TwapFormWarnings'
 
+export type { LabelTooltip, LabelTooltipItems } from './tooltips'
+
 export function TwapFormWidget() {
   const { chainId, account } = useWalletInfo()
   const isSafeApp = useIsSafeApp()
@@ -86,7 +91,7 @@ export function TwapFormWidget() {
 
       {!isWrapOrUnwrap && (
         <styledEl.Row>
-          <styledEl.StyledRateInfo label="Current market price" rateInfoParams={rateInfoParams} />
+          <styledEl.StyledRateInfo label={LABELS_TOOLTIPS.price.label} rateInfoParams={rateInfoParams} />
         </styledEl.Row>
       )}
 
@@ -98,8 +103,8 @@ export function TwapFormWidget() {
           }
           min={defaultNumOfParts}
           max={100}
-          label="No. of parts"
-          hint="Todo: No of parts hint"
+          label={LABELS_TOOLTIPS.numberOfParts.label}
+          tooltip={renderTooltip(LABELS_TOOLTIPS.numberOfParts.tooltip)}
         />
         <TradeNumberInput
           value={slippageValue}
@@ -107,25 +112,30 @@ export function TwapFormWidget() {
           decimalsPlaces={2}
           placeholder={DEFAULT_TWAP_SLIPPAGE.toFixed(1)}
           max={50}
-          label="Slippage"
-          hint="Todo: Slippage hint"
+          label={LABELS_TOOLTIPS.slippage.label}
+          tooltip={renderTooltip(LABELS_TOOLTIPS.slippage.tooltip)}
           suffix="%"
         />
       </styledEl.Row>
 
-      <AmountParts partsState={partsState} />
+      <AmountParts partsState={partsState} labels={AMOUNT_PARTS_LABELS} />
 
-      <styledEl.DeadlineRow>
+      <styledEl.Row>
         <DeadlineSelector
           deadline={deadlineState}
           items={orderDeadlines}
           setDeadline={(value) => updateSettingsState(value)}
+          label={LABELS_TOOLTIPS.totalDuration.label}
+          tooltip={renderTooltip(LABELS_TOOLTIPS.totalDuration.tooltip, {
+            parts: numberOfPartsValue,
+            partDuration: timeInterval,
+          })}
         />
 
-        <TradeTextBox label="Part every" hint="TODO: part every tooltip">
+        <TradeTextBox label={LABELS_TOOLTIPS.partDuration.label} tooltip={LABELS_TOOLTIPS.partDuration.tooltip}>
           <>{deadlinePartsDisplay(timeInterval)}</>
         </TradeTextBox>
-      </styledEl.DeadlineRow>
+      </styledEl.Row>
 
       <TwapFormWarnings localFormValidation={localFormValidation} />
       <ActionButtons localFormValidation={localFormValidation} primaryFormValidation={primaryFormValidation} />
diff --git a/src/modules/twap/containers/TwapFormWidget/styled.tsx b/src/modules/twap/containers/TwapFormWidget/styled.tsx
index 5271b99b10..67c521d174 100644
--- a/src/modules/twap/containers/TwapFormWidget/styled.tsx
+++ b/src/modules/twap/containers/TwapFormWidget/styled.tsx
@@ -1,21 +1,26 @@
 import styled from 'styled-components/macro'
 
+import { QuestionWrapper } from 'legacy/components/QuestionHelper'
+
 import { RateInfo } from 'common/pure/RateInfo'
 
 export const Row = styled.div`
   display: flex;
-  grid-gap: 10px;
+  grid-gap: 8px;
 
   ${({ theme }) => theme.mediaWidth.upToSmall`
     flex-direction: column;
     grid-gap: 6px;
   `}
-`
 
-export const DeadlineRow = styled(Row)`
-  grid-gap: 0;
-  background: ${({ theme }) => theme.grey1};
-  border-radius: 16px;
+  ${QuestionWrapper} {
+    opacity: 0.5;
+    transition: opacity 0.2s ease-in-out;
+
+    &:hover {
+      opacity: 1;
+    }
+  }
 `
 
 export const StyledRateInfo = styled(RateInfo)`
diff --git a/src/modules/twap/containers/TwapFormWidget/tooltips.tsx b/src/modules/twap/containers/TwapFormWidget/tooltips.tsx
new file mode 100644
index 0000000000..87dfb244c2
--- /dev/null
+++ b/src/modules/twap/containers/TwapFormWidget/tooltips.tsx
@@ -0,0 +1,77 @@
+import { deadlinePartsDisplay } from 'modules/twap/utils/deadlinePartsDisplay'
+
+export interface LabelTooltip {
+  label: string
+  tooltip?: React.ReactNode | ((params: any) => React.ReactNode)
+}
+
+export interface LabelTooltipItems {
+  [key: string]: LabelTooltip
+}
+
+export const LABELS_TOOLTIPS: LabelTooltipItems = {
+  numberOfParts: {
+    label: 'No. of parts',
+    tooltip: 'Your TWAP order will be split into this many parts, which will execute one by one.',
+  },
+  totalDuration: {
+    label: 'Total duration',
+    tooltip: ({ parts, partDuration }: { parts: number; partDuration: number }) => (
+      <>
+        {/* TODO: Add time units */}
+        The "Total duration" is the duration it takes to execute all parts of your TWAP order.
+        <br />
+        <br />
+        For instance, your order consists of <b>{parts} parts</b> placed every{' '}
+        <b>{deadlinePartsDisplay(partDuration)}</b>, the total time to complete the order is{' '}
+        <b>{deadlinePartsDisplay(parts * partDuration)}</b>. Each limit order remains open for{' '}
+        <b>{deadlinePartsDisplay(partDuration)}</b> until the next part becomes active.
+      </>
+    ),
+  },
+  partDuration: {
+    label: 'Part duration',
+    tooltip: (
+      <>
+        The "Part duration" refers to the duration between each part of your TWAP order.
+        <br />
+        <br />
+        Choosing a shorter time allows for faster execution of each part, potentially reducing price fluctuations.
+        Striking the right balance is crucial for optimal execution.
+      </>
+    ),
+  },
+  slippage: {
+    label: 'Slippage',
+    tooltip: (
+      <>
+        This slippage will apply to each part of your order. Since a TWAP order executes over a longer period of time,
+        your slippage should take into account possible price fluctuations over that time.
+        <br />
+        <br />
+        If your slippage is too low, you risk some parts of your order failing to execute.
+      </>
+    ),
+  },
+  price: {
+    label: 'Current market price',
+    tooltip: 'This is the current market price',
+  },
+  sellAmount: {
+    label: 'Sell per part',
+    tooltip: 'Estimated amount that will be sold in each part of the order.',
+  },
+  buyAmount: {
+    label: 'Buy per part',
+    tooltip: 'Estimated amount that you will receive from each part of the order.',
+  },
+  startTime: {
+    label: 'Start time',
+    tooltip: 'The order will start when it is validated and executed in your Safe.',
+  },
+}
+
+export const AMOUNT_PARTS_LABELS = {
+  sellAmount: LABELS_TOOLTIPS.sellAmount,
+  buyAmount: LABELS_TOOLTIPS.buyAmount,
+}
diff --git a/src/modules/twap/pure/AmountParts/index.tsx b/src/modules/twap/pure/AmountParts/index.tsx
index 48426be732..0a779625b8 100644
--- a/src/modules/twap/pure/AmountParts/index.tsx
+++ b/src/modules/twap/pure/AmountParts/index.tsx
@@ -1,9 +1,14 @@
+import React, { ReactNode } from 'react'
+
 import { Currency, CurrencyAmount } from '@uniswap/sdk-core'
 
 import { Trans } from '@lingui/macro'
 import { Nullish } from 'types'
 
 import QuestionHelper from 'legacy/components/QuestionHelper'
+import { renderTooltip } from 'legacy/components/Tooltip'
+
+import { LabelTooltipItems } from 'modules/twap'
 
 import * as styledEl from './styled'
 
@@ -13,7 +18,7 @@ interface TradeAmountPreviewProps {
   amount: Nullish<CurrencyAmount<Currency>>
   fiatAmount: Nullish<CurrencyAmount<Currency>>
   label: JSX.Element
-  tooltip: JSX.Element
+  tooltip: ReactNode
 }
 
 function TradeAmountPreview(props: TradeAmountPreviewProps) {
@@ -32,21 +37,30 @@ function TradeAmountPreview(props: TradeAmountPreviewProps) {
   )
 }
 
-export function AmountParts({ partsState }: { partsState: PartsState }) {
+export function AmountParts({ partsState, labels }: { partsState: PartsState; labels: LabelTooltipItems }) {
   const { numberOfPartsValue, inputPartAmount, outputPartAmount, inputFiatAmount, outputFiatAmount } = partsState
+  const { sellAmount, buyAmount } = labels
 
   return (
     <styledEl.Wrapper>
       <TradeAmountPreview
-        label={<Trans>Sell amount per part (1/{numberOfPartsValue})</Trans>}
-        tooltip={<Trans>TODO: Add buy tooltip text</Trans>}
+        label={
+          <>
+            {labels.sellAmount.label} (1/{numberOfPartsValue})
+          </>
+        }
+        tooltip={renderTooltip(sellAmount.tooltip)}
         amount={inputPartAmount}
         fiatAmount={inputFiatAmount}
       />
 
       <TradeAmountPreview
-        label={<Trans>Buy amount per part (1/{numberOfPartsValue})</Trans>}
-        tooltip={<Trans>TODO: Add sell tooltip text</Trans>}
+        label={
+          <>
+            {buyAmount.label} (1/{numberOfPartsValue})
+          </>
+        }
+        tooltip={renderTooltip(buyAmount.tooltip)}
         amount={outputPartAmount}
         fiatAmount={outputFiatAmount}
       />
diff --git a/src/modules/twap/pure/AmountParts/styled.tsx b/src/modules/twap/pure/AmountParts/styled.tsx
index 640c5ed841..4c18b6d69a 100644
--- a/src/modules/twap/pure/AmountParts/styled.tsx
+++ b/src/modules/twap/pure/AmountParts/styled.tsx
@@ -1,6 +1,8 @@
 import { transparentize } from 'polished'
 import styled from 'styled-components/macro'
 
+import { QuestionWrapper } from 'legacy/components/QuestionHelper'
+
 import { TradeWidgetFieldBox, TradeWidgetFieldLabel } from 'modules/trade/pure/TradeWidgetField/styled'
 
 import { FiatAmount } from 'common/pure/FiatAmount'
@@ -8,7 +10,7 @@ import { TokenAmount } from 'common/pure/TokenAmount'
 
 export const Wrapper = styled.div`
   display: flex;
-  grid-gap: 10px;
+  grid-gap: 8px;
 
   ${({ theme }) => theme.mediaWidth.upToSmall`
     flex-direction: column;
@@ -19,15 +21,24 @@ export const Wrapper = styled.div`
 export const Part = styled(TradeWidgetFieldBox)`
   background-color: transparent;
   border: 1px solid ${({ theme }) => theme.grey1};
+  align-content: flex-start;
 `
 
 export const Label = styled(TradeWidgetFieldLabel)`
-  font-size: 12px;
+  ${QuestionWrapper} {
+    opacity: 0.5;
+    transition: opacity 0.2s ease-in-out;
+
+    &:hover {
+      opacity: 1;
+    }
+  }
 `
+
 export const Amount = styled(TokenAmount)`
-  font-size: 20px;
+  font-size: 18px;
   font-weight: 500;
-  padding: 7px 0;
+  padding: 2px 0;
   width: 100%;
   overflow: hidden;
   text-overflow: ellipsis;
diff --git a/src/modules/twap/pure/DeadlineSelector/index.tsx b/src/modules/twap/pure/DeadlineSelector/index.tsx
index b4ccdb1f71..1bd8a3f6af 100644
--- a/src/modules/twap/pure/DeadlineSelector/index.tsx
+++ b/src/modules/twap/pure/DeadlineSelector/index.tsx
@@ -2,7 +2,11 @@ import React, { useCallback, useMemo, useState } from 'react'
 
 import styled from 'styled-components/macro'
 
+import { renderTooltip } from 'legacy/components/Tooltip'
+
 import { TradeSelect, TradeSelectItem } from 'modules/trade/pure/TradeSelect'
+import { Content } from 'modules/trade/pure/TradeWidgetField/styled'
+import { LabelTooltip } from 'modules/twap'
 
 import { defaultCustomDeadline, TwapOrdersDeadline } from '../../state/twapOrdersSettingsAtom'
 import { CustomDeadlineSelector } from '../CustomDeadlineSelector'
@@ -10,20 +14,31 @@ import { CustomDeadlineSelector } from '../CustomDeadlineSelector'
 interface DeadlineSelectorProps {
   items: TradeSelectItem[]
   deadline: TwapOrdersDeadline
+  label: LabelTooltip['label']
+  tooltip: LabelTooltip['tooltip']
   setDeadline(value: TwapOrdersDeadline): void
 }
 
 const CUSTOM_OPTION: TradeSelectItem = { label: 'Custom', value: 'CUSTOM_ITEM_VALUE' }
 
 const StyledTradeSelect = styled(TradeSelect)`
-  font-size: 14px;
   font-weight: 500;
+
+  ${Content} {
+    width: 100%;
+  }
+
+  ${Content} > div {
+    width: 100%;
+  }
 `
 
 export function DeadlineSelector(props: DeadlineSelectorProps) {
   const {
     items,
     deadline: { deadline, customDeadline, isCustomDeadline },
+    label,
+    tooltip,
     setDeadline,
   } = props
   const [isCustomModalOpen, setIsCustomModalOpen] = useState(false)
@@ -58,8 +73,8 @@ export function DeadlineSelector(props: DeadlineSelectorProps) {
   return (
     <>
       <StyledTradeSelect
-        label="Total time"
-        hint="TODO: Some hint"
+        label={label}
+        tooltip={renderTooltip(tooltip)}
         items={itemsWithCustom}
         activeLabel={activeLabel}
         onSelect={onSelect}

From 65a1dde5341a038161149b5dede8c13ee3e115d0 Mon Sep 17 00:00:00 2001
From: Leandro <alfetopito@users.noreply.github.com>
Date: Tue, 4 Jul 2023 02:58:39 -0700
Subject: [PATCH 50/67] feat(hackathon-surplus): use prod backend when on prod
 (#2779)

* chore: remove profile data related code

* feat: show prod surplus data when on prod

* chore: don't know why, but this change was breaking unittests

Revert "chore: remove profile data related code"

This reverts commit 5df9baf094689e36b95e4192fa8984e55854eecf.
---
 src/api/gnosisProtocol/api.ts | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/api/gnosisProtocol/api.ts b/src/api/gnosisProtocol/api.ts
index f00b136aaa..6f8ba50ed0 100644
--- a/src/api/gnosisProtocol/api.ts
+++ b/src/api/gnosisProtocol/api.ts
@@ -215,7 +215,7 @@ export type TotalSurplusData = {
 export async function getSurplusData(chainId: ChainId, address: string): Promise<TotalSurplusData> {
   console.log(`[api:${API_NAME}] Get surplus data for`, chainId, address)
 
-  const baseUrl = `https://barn.api.cow.fi/${NETWORK_TO_API_PREFIX[chainId]}/api`
+  const baseUrl = `${getBaseUrl()}${NETWORK_TO_API_PREFIX[chainId]}/api`
   const url = `/v1/users/${address}/total_surplus`
 
   const response = await fetch(baseUrl + url, {
@@ -224,3 +224,13 @@ export async function getSurplusData(chainId: ChainId, address: string): Promise
 
   return response.json()
 }
+
+// TODO: this is temporary until the surplus data is moved to the SDK
+function getBaseUrl(): string {
+  if (isLocal || isDev || isPr || isBarn) {
+    return 'https://barn.api.cow.fi/'
+  }
+
+  // Production, staging, ens, ...
+  return 'https://api.cow.fi/'
+}

From 19ed7eee9340fbb177ead02463330d38077b128e Mon Sep 17 00:00:00 2001
From: Alexandr Kazachenko <shoom3301@gmail.com>
Date: Tue, 4 Jul 2023 16:42:40 +0600
Subject: [PATCH 51/67] fix(twap): display fallback handler banner when it's
 relevant (#2757)

---
 .../TradeApprove/TradeApproveButton.tsx        |  5 +++--
 src/common/pure/ApproveButton/index.tsx        |  5 +++--
 .../pure/TradeFormButtons/index.tsx            |  2 +-
 .../pure/TradeFormButtons/tradeButtonsMap.tsx  | 14 +++++++-------
 .../twap/containers/ActionButtons/index.tsx    |  8 +++-----
 .../twap/containers/TwapFormWarnings/index.tsx |  7 +++----
 .../warnings/UnsupportedWalletWarning.tsx      |  5 +++--
 .../twap/containers/TwapFormWidget/index.tsx   |  8 +++-----
 .../twap/hooks/useAreWarningsAccepted.ts       | 18 ++++++++++++++++++
 .../hooks/useFallbackHandlerVerification.ts    |  5 +++++
 src/modules/twap/hooks/useTwapFormState.ts     |  5 +----
 .../twap/hooks/useTwapWarningsContext.ts       |  2 +-
 .../PrimaryActionButton/getTwapFormState.tsx   | 13 +------------
 .../twap/pure/PrimaryActionButton/index.tsx    |  5 -----
 14 files changed, 52 insertions(+), 50 deletions(-)
 create mode 100644 src/modules/twap/hooks/useAreWarningsAccepted.ts

diff --git a/src/common/containers/TradeApprove/TradeApproveButton.tsx b/src/common/containers/TradeApprove/TradeApproveButton.tsx
index dae8c233d4..a896666091 100644
--- a/src/common/containers/TradeApprove/TradeApproveButton.tsx
+++ b/src/common/containers/TradeApprove/TradeApproveButton.tsx
@@ -12,10 +12,11 @@ import { useTradeApproveState } from './useTradeApproveState'
 export interface TradeApproveButtonProps {
   amountToApprove: CurrencyAmount<Currency>
   children?: React.ReactNode
+  isDisabled?: boolean
 }
 
 export function TradeApproveButton(props: TradeApproveButtonProps) {
-  const { amountToApprove, children } = props
+  const { amountToApprove, children, isDisabled } = props
 
   const currency = amountToApprove.currency
 
@@ -33,7 +34,7 @@ export function TradeApproveButton(props: TradeApproveButtonProps) {
 
   return (
     <>
-      <ApproveButton currency={currency} onClick={handleApprove} state={approvalState} />
+      <ApproveButton isDisabled={isDisabled} currency={currency} onClick={handleApprove} state={approvalState} />
 
       {children}
     </>
diff --git a/src/common/pure/ApproveButton/index.tsx b/src/common/pure/ApproveButton/index.tsx
index 710c890e70..e8c4ea137c 100644
--- a/src/common/pure/ApproveButton/index.tsx
+++ b/src/common/pure/ApproveButton/index.tsx
@@ -20,15 +20,16 @@ export interface ApproveButtonProps {
   currency: Currency | undefined | null
   state: ApprovalState
   onClick: () => void
+  isDisabled?: boolean
 }
 
 export function ApproveButton(props: ApproveButtonProps) {
-  const { currency, state, onClick } = props
+  const { currency, state, onClick, isDisabled } = props
 
   const theme = useContext(ThemeContext)
   const isPending = state === ApprovalState.PENDING
   const isConfirmed = state === ApprovalState.APPROVED
-  const disabled = state !== ApprovalState.NOT_APPROVED
+  const disabled = isDisabled || state !== ApprovalState.NOT_APPROVED
 
   const content = useMemo(() => {
     if (isConfirmed) {
diff --git a/src/modules/tradeFormValidation/pure/TradeFormButtons/index.tsx b/src/modules/tradeFormValidation/pure/TradeFormButtons/index.tsx
index eb63f6e25a..c834a75815 100644
--- a/src/modules/tradeFormValidation/pure/TradeFormButtons/index.tsx
+++ b/src/modules/tradeFormValidation/pure/TradeFormButtons/index.tsx
@@ -35,7 +35,7 @@ export function TradeFormButtons(props: TradeFormButtonsProps) {
   const buttonFactory = tradeButtonsMap[validation]
 
   if (typeof buttonFactory === 'function') {
-    return buttonFactory(context)
+    return buttonFactory(context, isDisabled)
   }
 
   return (
diff --git a/src/modules/tradeFormValidation/pure/TradeFormButtons/tradeButtonsMap.tsx b/src/modules/tradeFormValidation/pure/TradeFormButtons/tradeButtonsMap.tsx
index cc034a60aa..ab4e433eed 100644
--- a/src/modules/tradeFormValidation/pure/TradeFormButtons/tradeButtonsMap.tsx
+++ b/src/modules/tradeFormValidation/pure/TradeFormButtons/tradeButtonsMap.tsx
@@ -19,7 +19,7 @@ interface ButtonErrorConfig {
 }
 
 interface ButtonCallback {
-  (context: TradeFormButtonContext): JSX.Element | null
+  (context: TradeFormButtonContext, isDisabled?: boolean): JSX.Element | null
 }
 
 const CompatibilityIssuesWarningWrapper = styled.div`
@@ -113,35 +113,35 @@ export const tradeButtonsMap: Record<TradeFormValidation, ButtonErrorConfig | Bu
       </TradeFormBlankButton>
     )
   },
-  [TradeFormValidation.ExpertApproveAndSwap]: (context) => {
+  [TradeFormValidation.ExpertApproveAndSwap]: (context, isDisabled = false) => {
     const tokenToApprove = context.derivedState.slippageAdjustedSellAmount?.currency.wrapped
 
     return (
-      <TradeFormBlankButton onClick={context.doTrade}>
+      <TradeFormBlankButton disabled={isDisabled} onClick={context.doTrade}>
         <Trans>
           Confirm (Approve&nbsp;{<TokenSymbol token={tokenToApprove} length={6} />}&nbsp;and {context.defaultText})
         </Trans>
       </TradeFormBlankButton>
     )
   },
-  [TradeFormValidation.ApproveAndSwap]: (context) => {
+  [TradeFormValidation.ApproveAndSwap]: (context, isDisabled = false) => {
     const tokenToApprove = context.derivedState.slippageAdjustedSellAmount?.currency.wrapped
 
     return (
-      <TradeFormBlankButton onClick={context.confirmTrade}>
+      <TradeFormBlankButton disabled={isDisabled} onClick={context.confirmTrade}>
         <Trans>
           Approve&nbsp;{<TokenSymbol token={tokenToApprove} length={6} />}&nbsp;and {context.defaultText}
         </Trans>
       </TradeFormBlankButton>
     )
   },
-  [TradeFormValidation.ApproveRequired]: (context) => {
+  [TradeFormValidation.ApproveRequired]: (context, isDisabled = false) => {
     const amountToApprove = context.derivedState.slippageAdjustedSellAmount
 
     if (!amountToApprove) return null
 
     return (
-      <TradeApproveButton amountToApprove={amountToApprove}>
+      <TradeApproveButton isDisabled={isDisabled} amountToApprove={amountToApprove}>
         <TradeFormBlankButton disabled={true}>
           <Trans>{context.defaultText}</Trans>
         </TradeFormBlankButton>
diff --git a/src/modules/twap/containers/ActionButtons/index.tsx b/src/modules/twap/containers/ActionButtons/index.tsx
index 2b35af0031..2ef4d08890 100644
--- a/src/modules/twap/containers/ActionButtons/index.tsx
+++ b/src/modules/twap/containers/ActionButtons/index.tsx
@@ -1,14 +1,13 @@
-import { useAtomValue } from 'jotai'
 import React from 'react'
 
 import { useTradeConfirmActions } from 'modules/trade'
 import { TradeFormButtons, TradeFormValidation } from 'modules/tradeFormValidation'
 import { useTradeFormButtonContext } from 'modules/tradeFormValidation'
 
+import { useAreWarningsAccepted } from '../../hooks/useAreWarningsAccepted'
 import { useTwapWarningsContext } from '../../hooks/useTwapWarningsContext'
 import { PrimaryActionButton } from '../../pure/PrimaryActionButton'
 import { TwapFormState } from '../../pure/PrimaryActionButton/getTwapFormState'
-import { twapOrdersSettingsAtom } from '../../state/twapOrdersSettingsAtom'
 
 interface ActionButtonsProps {
   localFormValidation: TwapFormState | null
@@ -16,13 +15,12 @@ interface ActionButtonsProps {
 }
 
 export function ActionButtons({ localFormValidation, primaryFormValidation }: ActionButtonsProps) {
-  const { isPriceImpactAccepted } = useAtomValue(twapOrdersSettingsAtom)
   const tradeConfirmActions = useTradeConfirmActions()
-  const { walletIsNotConnected, showPriceImpactWarning } = useTwapWarningsContext()
+  const { walletIsNotConnected } = useTwapWarningsContext()
 
   const confirmTrade = tradeConfirmActions.onOpen
 
-  const areWarningsAccepted = showPriceImpactWarning ? isPriceImpactAccepted : true
+  const areWarningsAccepted = useAreWarningsAccepted()
 
   const primaryActionContext = {
     confirmTrade,
diff --git a/src/modules/twap/containers/TwapFormWarnings/index.tsx b/src/modules/twap/containers/TwapFormWarnings/index.tsx
index 6b793ca2b1..9599c4dea3 100644
--- a/src/modules/twap/containers/TwapFormWarnings/index.tsx
+++ b/src/modules/twap/containers/TwapFormWarnings/index.tsx
@@ -12,10 +12,9 @@ import {
   UnsupportedWalletWarning,
 } from './warnings'
 
-import { useFallbackHandlerVerification } from '../../hooks/useFallbackHandlerVerification'
+import { useIsFallbackHandlerRequired } from '../../hooks/useFallbackHandlerVerification'
 import { useTwapWarningsContext } from '../../hooks/useTwapWarningsContext'
 import { TwapFormState } from '../../pure/PrimaryActionButton/getTwapFormState'
-import { ExtensibleFallbackVerification } from '../../services/verifyExtensibleFallback'
 import { twapOrdersSettingsAtom, updateTwapOrdersSettingsAtom } from '../../state/twapOrdersSettingsAtom'
 
 interface TwapFormWarningsProps {
@@ -27,7 +26,7 @@ export function TwapFormWarnings({ localFormValidation }: TwapFormWarningsProps)
   const updateTwapOrdersSettings = useUpdateAtom(updateTwapOrdersSettingsAtom)
 
   const { chainId } = useWalletInfo()
-  const fallbackHandlerVerification = useFallbackHandlerVerification()
+  const isFallbackHandlerRequired = useIsFallbackHandlerRequired()
   const isSafeViaWc = useIsSafeViaWc()
   const { canTrade, showPriceImpactWarning, walletIsNotConnected } = useTwapWarningsContext()
 
@@ -68,7 +67,7 @@ export function TwapFormWarnings({ localFormValidation }: TwapFormWarningsProps)
           return <SmallPartTimeWarning />
         }
 
-        if (canTrade && fallbackHandlerVerification !== ExtensibleFallbackVerification.HAS_DOMAIN_VERIFIER) {
+        if (canTrade && isFallbackHandlerRequired) {
           return (
             <FallbackHandlerWarning
               isFallbackHandlerSetupAccepted={isFallbackHandlerSetupAccepted}
diff --git a/src/modules/twap/containers/TwapFormWarnings/warnings/UnsupportedWalletWarning.tsx b/src/modules/twap/containers/TwapFormWarnings/warnings/UnsupportedWalletWarning.tsx
index 520013db54..3723d46d9b 100644
--- a/src/modules/twap/containers/TwapFormWarnings/warnings/UnsupportedWalletWarning.tsx
+++ b/src/modules/twap/containers/TwapFormWarnings/warnings/UnsupportedWalletWarning.tsx
@@ -18,8 +18,9 @@ export function UnsupportedWalletWarning({ isSafeViaWc }: { isSafeViaWc: boolean
 
   return (
     <InlineBanner type="alert">
-      <strong>Unsupported wallet detected:</strong> TWAP orders currently require a Safe with a special fallback
-      handler. <br />
+      <strong>Unsupported wallet detected</strong>
+      <br />
+      TWAP orders currently require a Safe with a special fallback handler. <br />
       Have one? Switch to it! {/*Need setup? <HashLink to="/faq/limit-order#how-do-fees-work">Click here</HashLink>.*/}{' '}
       <br />
       Future updates may extend wallet support!
diff --git a/src/modules/twap/containers/TwapFormWidget/index.tsx b/src/modules/twap/containers/TwapFormWidget/index.tsx
index 2824e2d331..cf4d79cd6e 100644
--- a/src/modules/twap/containers/TwapFormWidget/index.tsx
+++ b/src/modules/twap/containers/TwapFormWidget/index.tsx
@@ -20,11 +20,10 @@ import * as styledEl from './styled'
 import { AMOUNT_PARTS_LABELS, LABELS_TOOLTIPS } from './tooltips'
 
 import { DEFAULT_TWAP_SLIPPAGE, defaultNumOfParts, orderDeadlines } from '../../const'
-import { useFallbackHandlerVerification } from '../../hooks/useFallbackHandlerVerification'
+import { useIsFallbackHandlerRequired } from '../../hooks/useFallbackHandlerVerification'
 import { useTwapFormState } from '../../hooks/useTwapFormState'
 import { AmountParts } from '../../pure/AmountParts'
 import { DeadlineSelector } from '../../pure/DeadlineSelector'
-import { ExtensibleFallbackVerification } from '../../services/verifyExtensibleFallback'
 import { partsStateAtom } from '../../state/partsStateAtom'
 import { twapTimeIntervalAtom } from '../../state/twapOrderAtom'
 import { twapOrdersSettingsAtom, updateTwapOrdersSettingsAtom } from '../../state/twapOrdersSettingsAtom'
@@ -46,7 +45,7 @@ export function TwapFormWidget() {
   const { inputCurrencyAmount, outputCurrencyAmount } = useAdvancedOrdersDerivedState()
   const { inputCurrencyAmount: rawInputCurrencyAmount } = useAdvancedOrdersRawState()
   const { updateState } = useTradeState()
-  const fallbackHandlerVerification = useFallbackHandlerVerification()
+  const isFallbackHandlerRequired = useIsFallbackHandlerRequired()
 
   const partsState = useAtomValue(partsStateAtom)
   const timeInterval = useAtomValue(twapTimeIntervalAtom)
@@ -66,7 +65,6 @@ export function TwapFormWidget() {
     isCustomDeadline,
   }
 
-  const fallbackHandlerIsNotSet = fallbackHandlerVerification !== ExtensibleFallbackVerification.HAS_DOMAIN_VERIFIER
   const shouldLoadTwapOrders = !!(isSafeApp && chainId && account && composableCowContract)
 
   // Reset output amount when num of parts or input amount are changed
@@ -87,7 +85,7 @@ export function TwapFormWidget() {
       {shouldLoadTwapOrders && (
         <TwapOrdersUpdater composableCowContract={composableCowContract} safeAddress={account} chainId={chainId} />
       )}
-      <TwapConfirmModal fallbackHandlerIsNotSet={fallbackHandlerIsNotSet} />
+      <TwapConfirmModal fallbackHandlerIsNotSet={isFallbackHandlerRequired} />
 
       {!isWrapOrUnwrap && (
         <styledEl.Row>
diff --git a/src/modules/twap/hooks/useAreWarningsAccepted.ts b/src/modules/twap/hooks/useAreWarningsAccepted.ts
new file mode 100644
index 0000000000..ce7c039db9
--- /dev/null
+++ b/src/modules/twap/hooks/useAreWarningsAccepted.ts
@@ -0,0 +1,18 @@
+import { useAtomValue } from 'jotai'
+
+import { useIsFallbackHandlerRequired } from './useFallbackHandlerVerification'
+import { useTwapWarningsContext } from './useTwapWarningsContext'
+
+import { twapOrdersSettingsAtom } from '../state/twapOrdersSettingsAtom'
+
+export function useAreWarningsAccepted(): boolean {
+  const { isPriceImpactAccepted, isFallbackHandlerSetupAccepted } = useAtomValue(twapOrdersSettingsAtom)
+  const { showPriceImpactWarning } = useTwapWarningsContext()
+  const isFallbackHandlerRequired = useIsFallbackHandlerRequired()
+
+  if (showPriceImpactWarning) return isPriceImpactAccepted
+
+  if (isFallbackHandlerRequired) return isFallbackHandlerSetupAccepted
+
+  return true
+}
diff --git a/src/modules/twap/hooks/useFallbackHandlerVerification.ts b/src/modules/twap/hooks/useFallbackHandlerVerification.ts
index d189b91d03..afac67f687 100644
--- a/src/modules/twap/hooks/useFallbackHandlerVerification.ts
+++ b/src/modules/twap/hooks/useFallbackHandlerVerification.ts
@@ -1,7 +1,12 @@
 import { useAtomValue } from 'jotai/utils'
 
+import { ExtensibleFallbackVerification } from '../services/verifyExtensibleFallback'
 import { fallbackHandlerVerificationAtom } from '../state/fallbackHandlerVerificationAtom'
 
 export function useFallbackHandlerVerification() {
   return useAtomValue(fallbackHandlerVerificationAtom)
 }
+
+export function useIsFallbackHandlerRequired() {
+  return useFallbackHandlerVerification() !== ExtensibleFallbackVerification.HAS_DOMAIN_VERIFIER
+}
diff --git a/src/modules/twap/hooks/useTwapFormState.ts b/src/modules/twap/hooks/useTwapFormState.ts
index 1ed6eeb669..360378d170 100644
--- a/src/modules/twap/hooks/useTwapFormState.ts
+++ b/src/modules/twap/hooks/useTwapFormState.ts
@@ -8,10 +8,8 @@ import { useFallbackHandlerVerification } from './useFallbackHandlerVerification
 import { getTwapFormState, TwapFormState } from '../pure/PrimaryActionButton/getTwapFormState'
 import { partsStateAtom } from '../state/partsStateAtom'
 import { twapOrderAtom, twapTimeIntervalAtom } from '../state/twapOrderAtom'
-import { twapOrdersSettingsAtom } from '../state/twapOrdersSettingsAtom'
 
 export function useTwapFormState(): TwapFormState | null {
-  const { isFallbackHandlerSetupAccepted } = useAtomValue(twapOrdersSettingsAtom)
   const { chainId } = useWalletInfo()
 
   const twapOrder = useAtomValue(twapOrderAtom)
@@ -24,12 +22,11 @@ export function useTwapFormState(): TwapFormState | null {
   return useMemo(() => {
     return getTwapFormState({
       isSafeApp,
-      isFallbackHandlerSetupAccepted,
       verification,
       twapOrder,
       sellAmountPartFiat,
       chainId,
       partTime,
     })
-  }, [isSafeApp, isFallbackHandlerSetupAccepted, verification, twapOrder, sellAmountPartFiat, chainId, partTime])
+  }, [isSafeApp, verification, twapOrder, sellAmountPartFiat, chainId, partTime])
 }
diff --git a/src/modules/twap/hooks/useTwapWarningsContext.ts b/src/modules/twap/hooks/useTwapWarningsContext.ts
index d64afeb567..d48833c241 100644
--- a/src/modules/twap/hooks/useTwapWarningsContext.ts
+++ b/src/modules/twap/hooks/useTwapWarningsContext.ts
@@ -16,7 +16,7 @@ export function useTwapWarningsContext(): TwapWarningsContext {
   return useMemo(() => {
     // TODO: bind to settings
     const expertMode = false
-    const canTrade = !primaryFormValidation
+    const canTrade = !primaryFormValidation || primaryFormValidation >= TradeFormValidation.ExpertApproveAndSwap
     const showPriceImpactWarning = canTrade && !expertMode && !!priceImpact.error
     const walletIsNotConnected = primaryFormValidation === TradeFormValidation.WalletNotConnected
 
diff --git a/src/modules/twap/pure/PrimaryActionButton/getTwapFormState.tsx b/src/modules/twap/pure/PrimaryActionButton/getTwapFormState.tsx
index 191a629d88..3b874756d8 100644
--- a/src/modules/twap/pure/PrimaryActionButton/getTwapFormState.tsx
+++ b/src/modules/twap/pure/PrimaryActionButton/getTwapFormState.tsx
@@ -10,7 +10,6 @@ import { isSellAmountTooSmall } from '../../utils/isSellAmountTooSmall'
 
 export interface TwapFormStateParams {
   isSafeApp: boolean
-  isFallbackHandlerSetupAccepted: boolean
   verification: ExtensibleFallbackVerification | null
   twapOrder: TWAPOrder | null
   sellAmountPartFiat: Nullish<CurrencyAmount<Currency>>
@@ -21,27 +20,17 @@ export interface TwapFormStateParams {
 export enum TwapFormState {
   LOADING_SAFE_INFO = 'LOADING_SAFE_INFO',
   NOT_SAFE = 'NOT_SAFE',
-  NEED_FALLBACK_HANDLER = 'NEED_FALLBACK_HANDLER',
   SELL_AMOUNT_TOO_SMALL = 'SELL_AMOUNT_TOO_SMALL',
   PART_TIME_INTERVAL_TOO_SHORT = 'PART_TIME_INTERVAL_TOO_SHORT',
 }
 
 export function getTwapFormState(props: TwapFormStateParams): TwapFormState | null {
-  const { twapOrder, isSafeApp, isFallbackHandlerSetupAccepted, verification, sellAmountPartFiat, chainId, partTime } =
-    props
+  const { isSafeApp, verification, sellAmountPartFiat, chainId, partTime } = props
 
   if (!isSafeApp) return TwapFormState.NOT_SAFE
 
   if (verification === null) return TwapFormState.LOADING_SAFE_INFO
 
-  if (
-    twapOrder &&
-    verification !== ExtensibleFallbackVerification.HAS_DOMAIN_VERIFIER &&
-    !isFallbackHandlerSetupAccepted
-  ) {
-    return TwapFormState.NEED_FALLBACK_HANDLER
-  }
-
   if (isSellAmountTooSmall(sellAmountPartFiat, chainId)) {
     return TwapFormState.SELL_AMOUNT_TOO_SMALL
   }
diff --git a/src/modules/twap/pure/PrimaryActionButton/index.tsx b/src/modules/twap/pure/PrimaryActionButton/index.tsx
index 8521e33f0b..8e5b2fa36d 100644
--- a/src/modules/twap/pure/PrimaryActionButton/index.tsx
+++ b/src/modules/twap/pure/PrimaryActionButton/index.tsx
@@ -20,11 +20,6 @@ const buttonsMap: Record<TwapFormState, (context: PrimaryActionButtonContext) =>
       Unsupported wallet
     </ButtonPrimary>
   ),
-  [TwapFormState.NEED_FALLBACK_HANDLER]: () => (
-    <ButtonPrimary disabled={true} buttonSize={ButtonSize.BIG}>
-      Unsupported Safe
-    </ButtonPrimary>
-  ),
   [TwapFormState.SELL_AMOUNT_TOO_SMALL]: () => (
     <ButtonPrimary disabled={true} buttonSize={ButtonSize.BIG}>
       Sell amount too small

From 7901e1ac0fa6df6410be78382949675ac94be8a5 Mon Sep 17 00:00:00 2001
From: Alexandr Kazachenko <shoom3301@gmail.com>
Date: Wed, 5 Jul 2023 13:13:12 +0600
Subject: [PATCH 52/67] feat(twap): generate all part orders (#2759)

---
 src/api/gnosisProtocol/hooks.ts               |   6 -
 src/common/types.ts                           |   2 +-
 .../twap/containers/TwapFormWidget/index.tsx  |   2 +
 .../twap/hooks/useFetchTwapPartOrders.ts      |  84 ------------
 src/modules/twap/state/twapPartOrdersAtom.ts  |  22 +---
 .../twap/updaters/PartOrdersUpdater.tsx       | 120 ++++++++++++++++++
 .../twap/updaters/TwapOrdersUpdater.tsx       |  14 +-
 .../twap/utils/buildTwapOrdersItems.ts        |   4 +-
 src/modules/twap/utils/getTwapOrderStatus.ts  |  15 ++-
 9 files changed, 143 insertions(+), 126 deletions(-)
 delete mode 100644 src/modules/twap/hooks/useFetchTwapPartOrders.ts
 create mode 100644 src/modules/twap/updaters/PartOrdersUpdater.tsx

diff --git a/src/api/gnosisProtocol/hooks.ts b/src/api/gnosisProtocol/hooks.ts
index 7dc8b6602a..43d2c4ff14 100644
--- a/src/api/gnosisProtocol/hooks.ts
+++ b/src/api/gnosisProtocol/hooks.ts
@@ -115,12 +115,6 @@ function useTwapChildOrders(prodOrders: EnrichedOrder[] | undefined): OrderWithC
   }, [twapParticleOrders, prodOrders])
 }
 
-export function useHasOrders(account?: string | null): boolean | undefined {
-  const gpOrders = useGpOrders(account)
-
-  return (gpOrders?.length || 0) > 0
-}
-
 export type UseSurplusAmountResult = {
   surplusAmount: Nullish<CurrencyAmount<Currency>>
   isLoading: boolean
diff --git a/src/common/types.ts b/src/common/types.ts
index 79b41ccd55..e6569d3086 100644
--- a/src/common/types.ts
+++ b/src/common/types.ts
@@ -19,7 +19,7 @@ export type OrderWithComposableCowInfo = {
 
 export type SafeTransactionParams = {
   submissionDate: string
-  executionDate: string
+  executionDate: string | null
   isExecuted: boolean
   nonce: number
   confirmationsRequired: number
diff --git a/src/modules/twap/containers/TwapFormWidget/index.tsx b/src/modules/twap/containers/TwapFormWidget/index.tsx
index cf4d79cd6e..9e1286c8c3 100644
--- a/src/modules/twap/containers/TwapFormWidget/index.tsx
+++ b/src/modules/twap/containers/TwapFormWidget/index.tsx
@@ -28,6 +28,7 @@ import { partsStateAtom } from '../../state/partsStateAtom'
 import { twapTimeIntervalAtom } from '../../state/twapOrderAtom'
 import { twapOrdersSettingsAtom, updateTwapOrdersSettingsAtom } from '../../state/twapOrdersSettingsAtom'
 import { FallbackHandlerVerificationUpdater } from '../../updaters/FallbackHandlerVerificationUpdater'
+import { PartOrdersUpdater } from '../../updaters/PartOrdersUpdater'
 import { TwapOrdersUpdater } from '../../updaters/TwapOrdersUpdater'
 import { deadlinePartsDisplay } from '../../utils/deadlinePartsDisplay'
 import { ActionButtons } from '../ActionButtons'
@@ -82,6 +83,7 @@ export function TwapFormWidget() {
     <>
       <QuoteObserverUpdater />
       <FallbackHandlerVerificationUpdater />
+      <PartOrdersUpdater />
       {shouldLoadTwapOrders && (
         <TwapOrdersUpdater composableCowContract={composableCowContract} safeAddress={account} chainId={chainId} />
       )}
diff --git a/src/modules/twap/hooks/useFetchTwapPartOrders.ts b/src/modules/twap/hooks/useFetchTwapPartOrders.ts
deleted file mode 100644
index 0ab8e6167b..0000000000
--- a/src/modules/twap/hooks/useFetchTwapPartOrders.ts
+++ /dev/null
@@ -1,84 +0,0 @@
-import { useMemo } from 'react'
-
-import { ComposableCoW } from '@cowprotocol/abis'
-import type { Order } from '@cowprotocol/contracts'
-import { OrderParameters, SupportedChainId } from '@cowprotocol/cow-sdk'
-
-import { useAsyncMemo } from 'use-async-memo'
-
-import { computeOrderUid } from 'utils/orderUtils/computeOrderUid'
-
-import { TradeableOrderWithSignature, useTwapOrdersTradeableMulticall } from './useTwapOrdersTradeableMulticall'
-
-import { TwapPartOrderItem, TwapPartOrders } from '../state/twapPartOrdersAtom'
-import { TwapOrderInfo } from '../types'
-
-export function useFetchTwapPartOrders(
-  safeAddress: string,
-  chainId: SupportedChainId,
-  composableCowContract: ComposableCoW,
-  ordersInfo: TwapOrderInfo[]
-): TwapPartOrders | null {
-  const ordersToVerifyParams = useMemo(() => {
-    return ordersInfo.map((info) => info.safeData.conditionalOrderParams)
-  }, [ordersInfo])
-
-  const ordersTradeableData = useTwapOrdersTradeableMulticall(safeAddress, composableCowContract, ordersToVerifyParams)
-
-  const items = useAsyncMemo(
-    () => {
-      if (ordersInfo.length !== ordersTradeableData.length) return null
-
-      const safeAddressLowerCase = safeAddress.toLowerCase()
-
-      return Promise.all(
-        ordersInfo.map(({ id }, index) => {
-          const data = ordersTradeableData[index]
-          return data ? getTwapPartOrderItem(chainId, safeAddressLowerCase, data, id) : Promise.resolve(null)
-        })
-      )
-    },
-    [chainId, safeAddress, ordersInfo, ordersTradeableData],
-    null
-  )
-
-  return useMemo(() => {
-    if (!items) return null
-
-    return ordersInfo.reduce((acc, { id }, index) => {
-      const item = items[index]
-
-      if (item) acc[id] = item
-
-      return acc
-    }, {} as TwapPartOrders)
-  }, [ordersInfo, items])
-}
-
-async function getTwapPartOrderItem(
-  chainId: SupportedChainId,
-  safeAddress: string,
-  data: TradeableOrderWithSignature,
-  twapOrderId: string
-): Promise<TwapPartOrderItem | null> {
-  if (!data) return null
-
-  const { order: partOrder, signature } = data
-  const { sellToken, buyToken, receiver, validTo, appData } = partOrder
-  const fixedOrder = {
-    sellToken,
-    buyToken,
-    receiver,
-    validTo,
-    appData,
-    sellAmount: partOrder.sellAmount.toString(),
-    buyAmount: partOrder.buyAmount.toString(),
-    feeAmount: partOrder.feeAmount.toString(),
-    kind: 'sell', // Twap order is always sell
-    partiallyFillable: partOrder.partiallyFillable,
-  } as Order
-
-  const uid = await computeOrderUid(chainId, safeAddress, fixedOrder)
-
-  return { uid, chainId, safeAddress, twapOrderId, order: fixedOrder as OrderParameters, signature }
-}
diff --git a/src/modules/twap/state/twapPartOrdersAtom.ts b/src/modules/twap/state/twapPartOrdersAtom.ts
index bba7770079..5b5579428e 100644
--- a/src/modules/twap/state/twapPartOrdersAtom.ts
+++ b/src/modules/twap/state/twapPartOrdersAtom.ts
@@ -3,29 +3,19 @@ import { atomWithStorage } from 'jotai/utils'
 
 import { OrderParameters, SupportedChainId } from '@cowprotocol/cow-sdk'
 
-import deepEqual from 'fast-deep-equal'
-
 import { walletInfoAtom } from 'modules/wallet/api/state'
 
 export interface TwapPartOrderItem {
   uid: string
+  index: number
   chainId: SupportedChainId
   safeAddress: string
   twapOrderId: string
   order: OrderParameters
-  signature: string
 }
-export type TwapPartOrders = { [twapOrderHash: string]: TwapPartOrderItem }
-
-export const twapPartOrdersAtom = atomWithStorage<TwapPartOrders>('twap-part-orders-list:v1', {})
+export type TwapPartOrders = { [twapOrderHash: string]: TwapPartOrderItem[] }
 
-export const updateTwapPartOrdersAtom = atom(null, (get, set, nextState: TwapPartOrders) => {
-  const currentState = get(twapPartOrdersAtom)
-
-  if (!deepEqual(currentState, nextState)) {
-    set(twapPartOrdersAtom, nextState)
-  }
-})
+export const twapPartOrdersAtom = atomWithStorage<TwapPartOrders>('twap-part-orders-list:v2', {})
 
 export const twapPartOrdersListAtom = atom<TwapPartOrderItem[]>((get) => {
   const { account, chainId } = get(walletInfoAtom)
@@ -34,7 +24,7 @@ export const twapPartOrdersListAtom = atom<TwapPartOrderItem[]>((get) => {
 
   const accountLowerCase = account.toLowerCase()
 
-  return Object.values(get(twapPartOrdersAtom)).filter(
-    (order) => order.safeAddress === accountLowerCase && order.chainId === chainId
-  )
+  const orders = Object.values(get(twapPartOrdersAtom))
+
+  return orders.flat().filter((order) => order.safeAddress === accountLowerCase && order.chainId === chainId)
 })
diff --git a/src/modules/twap/updaters/PartOrdersUpdater.tsx b/src/modules/twap/updaters/PartOrdersUpdater.tsx
new file mode 100644
index 0000000000..b460e4051f
--- /dev/null
+++ b/src/modules/twap/updaters/PartOrdersUpdater.tsx
@@ -0,0 +1,120 @@
+import { useAtomValue, useUpdateAtom } from 'jotai/utils'
+import { useEffect } from 'react'
+
+import { Order } from '@cowprotocol/contracts'
+import { OrderParameters, SupportedChainId } from '@cowprotocol/cow-sdk'
+
+import { isTruthy } from 'legacy/utils/misc'
+
+import { useWalletInfo } from 'modules/wallet'
+
+import { computeOrderUid } from 'utils/orderUtils/computeOrderUid'
+
+import { twapOrdersListAtom } from '../state/twapOrdersListAtom'
+import { TwapPartOrderItem, twapPartOrdersAtom } from '../state/twapPartOrdersAtom'
+import { TwapOrderItem } from '../types'
+
+export function PartOrdersUpdater() {
+  const { chainId, account } = useWalletInfo()
+  const twapOrdersList = useAtomValue(twapOrdersListAtom)
+  const updateTwapPartOrders = useUpdateAtom(twapPartOrdersAtom)
+
+  useEffect(() => {
+    if (!chainId || !account) return
+
+    const accountLowerCase = account.toLowerCase()
+    const twapOrders = Object.values(twapOrdersList)
+
+    const ordersParts$ = twapOrders.map((twapOrder) => {
+      return generateTwapOrderParts(twapOrder, accountLowerCase, chainId)
+    })
+
+    Promise.all(ordersParts$).then((ordersParts) => {
+      const ordersMap = ordersParts.reduce((acc, item) => {
+        return {
+          ...acc,
+          ...item,
+        }
+      }, {})
+
+      updateTwapPartOrders(ordersMap)
+    })
+  }, [chainId, account, twapOrdersList, updateTwapPartOrders])
+
+  return null
+}
+
+async function generateTwapOrderParts(
+  twapOrder: TwapOrderItem,
+  safeAddress: string,
+  chainId: SupportedChainId
+): Promise<{ [id: string]: TwapPartOrderItem[] }> {
+  const twapOrderId = twapOrder.id
+
+  const parts = [...new Array(twapOrder.order.n)]
+    .map((_, index) => createPartOrderFromParent(twapOrder, index))
+    .filter(isTruthy)
+
+  const ids = await Promise.all(parts.map((part) => computeOrderUid(chainId, safeAddress, part as Order)))
+
+  return {
+    [twapOrderId]: ids.map<TwapPartOrderItem>((uid, index) => {
+      return {
+        uid,
+        index,
+        twapOrderId,
+        chainId,
+        safeAddress,
+        order: parts[index],
+      }
+    }),
+  }
+}
+
+function createPartOrderFromParent(twapOrder: TwapOrderItem, index: number): OrderParameters | null {
+  const executionDate = twapOrder.safeTxParams?.executionDate
+
+  if (!executionDate) {
+    return null
+  }
+
+  const blockTimestamp = new Date(executionDate)
+
+  return {
+    sellToken: twapOrder.order.sellToken,
+    buyToken: twapOrder.order.buyToken,
+    receiver: twapOrder.order.receiver,
+    sellAmount: twapOrder.order.partSellAmount,
+    buyAmount: twapOrder.order.minPartLimit,
+    validTo: calculateValidTo({
+      part: index,
+      startTime: Math.ceil(blockTimestamp.getTime() / 1000),
+      span: twapOrder.order.span,
+      frequency: twapOrder.order.t,
+    }),
+    appData: twapOrder.order.appData,
+    feeAmount: '0',
+    kind: 'sell',
+    partiallyFillable: false,
+    sellTokenBalance: 'erc20',
+    buyTokenBalance: 'erc20',
+  } as OrderParameters
+}
+
+function calculateValidTo({
+  part,
+  startTime,
+  frequency,
+  span,
+}: {
+  part: number
+  startTime: number
+  frequency: number
+  span: number
+}): number {
+  if (span === 0) {
+    return startTime + (part + 1) * frequency - 1
+  }
+
+  return startTime + part * frequency + span - 1
+}
diff --git a/src/modules/twap/updaters/TwapOrdersUpdater.tsx b/src/modules/twap/updaters/TwapOrdersUpdater.tsx
index 2ec086996a..dc98105b8d 100644
--- a/src/modules/twap/updaters/TwapOrdersUpdater.tsx
+++ b/src/modules/twap/updaters/TwapOrdersUpdater.tsx
@@ -8,11 +8,9 @@ import { isTruthy } from 'legacy/utils/misc'
 
 import { TWAP_PENDING_STATUSES } from '../const'
 import { useFetchTwapOrdersFromSafe } from '../hooks/useFetchTwapOrdersFromSafe'
-import { useFetchTwapPartOrders } from '../hooks/useFetchTwapPartOrders'
 import { useTwapDiscreteOrders } from '../hooks/useTwapDiscreteOrders'
 import { useTwapOrdersAuthMulticall } from '../hooks/useTwapOrdersAuthMulticall'
 import { twapOrdersListAtom, updateTwapOrdersListAtom } from '../state/twapOrdersListAtom'
-import { updateTwapPartOrdersAtom } from '../state/twapPartOrdersAtom'
 import { TwapOrderInfo } from '../types'
 import { buildTwapOrdersItems } from '../utils/buildTwapOrdersItems'
 import { getConditionalOrderId } from '../utils/getConditionalOrderId'
@@ -29,7 +27,6 @@ export function TwapOrdersUpdater(props: {
   const twapDiscreteOrders = useTwapDiscreteOrders()
   const twapOrdersList = useAtomValue(twapOrdersListAtom)
   const updateTwapOrders = useUpdateAtom(updateTwapOrdersListAtom)
-  const updateTwapPartOrders = useUpdateAtom(updateTwapPartOrdersAtom)
   const ordersSafeData = useFetchTwapOrdersFromSafe(props)
 
   const allOrdersInfo: TwapOrderInfo[] = useMemo(() => {
@@ -38,12 +35,13 @@ export function TwapOrdersUpdater(props: {
         try {
           const id = getConditionalOrderId(data.conditionalOrderParams)
           const order = parseTwapOrderStruct(data.conditionalOrderParams.staticInput)
+          const { executionDate } = data.safeTxParams
 
           return {
             id,
             orderStruct: order,
             safeData: data,
-            isExpired: isTwapOrderExpired(order),
+            isExpired: isTwapOrderExpired(order, executionDate ? new Date(executionDate) : null),
           }
         } catch (e) {
           return null
@@ -65,7 +63,6 @@ export function TwapOrdersUpdater(props: {
     })
   }, [allOrdersInfo, twapOrdersList])
 
-  const partOrders = useFetchTwapPartOrders(safeAddress, chainId, composableCowContract, pendingOrCancelledOrders)
   // Here we know which orders are cancelled: if it's auth === false, then it's cancelled
   const ordersAuthResult = useTwapOrdersAuthMulticall(safeAddress, composableCowContract, pendingOrCancelledOrders)
 
@@ -73,15 +70,8 @@ export function TwapOrdersUpdater(props: {
     if (!ordersAuthResult || !twapDiscreteOrders) return
 
     const items = buildTwapOrdersItems(chainId, safeAddress, allOrdersInfo, ordersAuthResult, twapDiscreteOrders)
-
     updateTwapOrders(items)
   }, [chainId, safeAddress, allOrdersInfo, ordersAuthResult, twapDiscreteOrders, updateTwapOrders])
 
-  useEffect(() => {
-    if (!partOrders) return
-
-    updateTwapPartOrders(partOrders)
-  }, [partOrders, updateTwapPartOrders])
-
   return null
 }
diff --git a/src/modules/twap/utils/buildTwapOrdersItems.ts b/src/modules/twap/utils/buildTwapOrdersItems.ts
index 6788be02c7..1a7bc39566 100644
--- a/src/modules/twap/utils/buildTwapOrdersItems.ts
+++ b/src/modules/twap/utils/buildTwapOrdersItems.ts
@@ -31,9 +31,9 @@ function getTwapOrderItem(
   discreteOrder: Order | undefined
 ): TwapOrderItem {
   const { conditionalOrderParams, safeTxParams } = safeData
-  const { isExecuted, submissionDate } = safeTxParams
+  const { isExecuted, submissionDate, executionDate: _executionDate } = safeTxParams
 
-  const executionDate = new Date(safeTxParams.executionDate)
+  const executionDate = _executionDate ? new Date(_executionDate) : null
   const order = parseTwapOrderStruct(conditionalOrderParams.staticInput)
   const status = getTwapOrderStatus(order, isExecuted, executionDate, authorized, discreteOrder)
 
diff --git a/src/modules/twap/utils/getTwapOrderStatus.ts b/src/modules/twap/utils/getTwapOrderStatus.ts
index 4590514e0e..4c6a4b945a 100644
--- a/src/modules/twap/utils/getTwapOrderStatus.ts
+++ b/src/modules/twap/utils/getTwapOrderStatus.ts
@@ -9,11 +9,11 @@ const AUTH_THRESHOLD = ms`1m`
 export function getTwapOrderStatus(
   order: TWAPOrderStruct,
   isExecuted: boolean,
-  executionDate: Date,
+  executionDate: Date | null,
   auth: boolean | undefined,
   discreteOrder: Order | undefined
 ): TwapOrderStatus {
-  if (isTwapOrderExpired(order)) return TwapOrderStatus.Expired
+  if (isTwapOrderExpired(order, executionDate)) return TwapOrderStatus.Expired
 
   if (!isExecuted) return TwapOrderStatus.WaitSigning
 
@@ -24,8 +24,11 @@ export function getTwapOrderStatus(
   return TwapOrderStatus.Scheduled
 }
 
-export function isTwapOrderExpired(order: TWAPOrderStruct): boolean {
-  const { t0: startTime, n: numOfParts, t: timeInterval } = order
+export function isTwapOrderExpired(order: TWAPOrderStruct, startDate: Date | null): boolean {
+  if (!startDate) return false
+
+  const startTime = Math.ceil(startDate.getTime() / 1000)
+  const { n: numOfParts, t: timeInterval } = order
   const endTime = startTime + timeInterval * numOfParts
   const nowTimestamp = Math.ceil(Date.now() / 1000)
 
@@ -36,7 +39,9 @@ export function isTwapOrderExpired(order: TWAPOrderStruct): boolean {
  * ComposableCow.singleOrders returns false by default
  * To avoid false-positive values, we should not check authorized flag within first minute after execution time
  */
-function shouldCheckAuth(executionDate: Date): boolean {
+function shouldCheckAuth(executionDate: Date | null): boolean {
+  if (!executionDate) return false
+
   const executionTimestamp = executionDate.getTime()
   const nowTimestamp = Date.now()
 

From 910a5c7155aac2adb8214d7ef9e1864d74be2116 Mon Sep 17 00:00:00 2001
From: Nenad Vracar <34926005+nenadV91@users.noreply.github.com>
Date: Wed, 5 Jul 2023 10:04:34 +0200
Subject: [PATCH 53/67] fix(twap): display total time nicer (#2783)

---
 src/modules/twap/pure/DeadlineSelector/index.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/modules/twap/pure/DeadlineSelector/index.tsx b/src/modules/twap/pure/DeadlineSelector/index.tsx
index 1bd8a3f6af..36260920b4 100644
--- a/src/modules/twap/pure/DeadlineSelector/index.tsx
+++ b/src/modules/twap/pure/DeadlineSelector/index.tsx
@@ -7,6 +7,7 @@ import { renderTooltip } from 'legacy/components/Tooltip'
 import { TradeSelect, TradeSelectItem } from 'modules/trade/pure/TradeSelect'
 import { Content } from 'modules/trade/pure/TradeWidgetField/styled'
 import { LabelTooltip } from 'modules/twap'
+import { customDeadlineToSeconds, deadlinePartsDisplay } from 'modules/twap/utils/deadlinePartsDisplay'
 
 import { defaultCustomDeadline, TwapOrdersDeadline } from '../../state/twapOrdersSettingsAtom'
 import { CustomDeadlineSelector } from '../CustomDeadlineSelector'
@@ -64,7 +65,7 @@ export function DeadlineSelector(props: DeadlineSelectorProps) {
 
   const activeLabel = useMemo(() => {
     if (isCustomDeadline) {
-      return `${customDeadline.hours}h ${customDeadline.minutes}m`
+      return deadlinePartsDisplay(customDeadlineToSeconds(customDeadline))
     }
 
     return items.find((item) => item.value === deadline)?.label || ''

From 645b069d6235e3f3758fe2f28c61ab1a08e8d7f2 Mon Sep 17 00:00:00 2001
From: Leandro <alfetopito@users.noreply.github.com>
Date: Wed, 5 Jul 2023 01:26:50 -0700
Subject: [PATCH 54/67] feat(hackathon-surplus): show surplus modal when
 confirmation modal is closed (#2773)

* refactor: remove ModalMod mod file and move it to index

* refactor: move styled modal stuff to styled file

* chore: typo on comment

* chore: remove TransactionConfirmationModal from ConfirmSwapModal

Did not seem to be in needed as there's another instance called from within
ConfirmSwap modal.

Must test other use cases to be sure it still works as before

* feat: add state for surplusModal

* feat: add SurplusModalSetup to wrap SurplusModal

* feat: when order is fulfilled, add it to surplus modal queue

* feat: sync confirmation modal status to surplusModal state

* feat: add SurplusModal to SwapModals

* fix: add fn to hook deps array

* Revert "chore: remove TransactionConfirmationModal from ConfirmSwapModal"

This reverts commit 4a45dea65f5f2159f364cfbd07e6fa63068f9de0.

* refactor: rename GpModal to CowModal

* feat: add `an extra` to twitter share msg

* fix: move SurplusModal inside Section to fix css

* chore: add `class` from api reponse to `OrderInfoApi`

* chore: only add surplus modal for market orders
---
 .../MultipleOrdersCancellationModal/index.tsx |   2 +-
 .../ZeroApprovalModal/ZeroApprovalModal.tsx   |   6 +-
 src/common/pure/CancellationModal/index.tsx   |   2 +-
 .../ConfirmationModal/ConfirmationModal.tsx   |   2 +-
 .../ConfirmationPendingContent.cosmos.tsx     |   6 +-
 src/common/pure/ExpertModeModal/index.tsx     |   2 +-
 src/common/pure/Modal/index.ts                | 105 --------------
 .../pure/Modal/{ModalMod.tsx => index.tsx}    | 135 +++++++++---------
 src/common/pure/Modal/styled.tsx              | 113 +++++++++++++++
 .../SurplusModal.tsx                          |  14 +-
 .../components/CowSubsidyModal/index.tsx      |  10 +-
 .../SearchModal/CurrencySearchModal.tsx       |   2 +-
 .../components/TokenWarningModal/index.tsx    |   2 +-
 .../TransactionConfirmationModal/index.tsx    |  37 +++--
 .../UnsupportedCurrencyFooterMod.tsx          |   2 +-
 src/legacy/hooks/useTransactionErrorModal.tsx |   8 +-
 src/legacy/state/index.ts                     |   2 +-
 src/legacy/state/orders/actions.ts            |   4 +-
 .../orders/updaters/CancelledOrdersUpdater.ts |  11 +-
 .../orders/updaters/PendingOrdersUpdater.ts   |  21 ++-
 .../pure/ConnectedAccountBlocked/index.tsx    |   2 +-
 .../pure/DeadlineSelector/index.tsx           |   5 +-
 .../ordersTable/pure/ReceiptModal/index.tsx   |   6 +-
 src/modules/swap/containers/EthFlow/index.tsx |   6 +-
 .../containers/SurplusModalSetup/index.tsx    |  38 +++++
 .../swap/containers/SwapModals/index.tsx      |   3 +
 .../EthFlowModalContent/index.cosmos.tsx      |   6 +-
 src/modules/swap/state/surplusModal.ts        |  81 +++++++++++
 .../containers/TradeConfirmModal/index.tsx    |   6 +-
 .../containers/WrapNativeModal/index.tsx      |   6 +-
 .../pure/CustomDeadlineSelector/index.tsx     |   2 +-
 .../wallet/api/pure/WalletModal/index.tsx     |   6 +-
 32 files changed, 403 insertions(+), 250 deletions(-)
 delete mode 100644 src/common/pure/Modal/index.ts
 rename src/common/pure/Modal/{ModalMod.tsx => index.tsx} (52%)
 create mode 100644 src/common/pure/Modal/styled.tsx
 create mode 100644 src/modules/swap/containers/SurplusModalSetup/index.tsx
 create mode 100644 src/modules/swap/state/surplusModal.ts

diff --git a/src/common/containers/MultipleOrdersCancellationModal/index.tsx b/src/common/containers/MultipleOrdersCancellationModal/index.tsx
index d4aeb18c0b..2804bf8d20 100644
--- a/src/common/containers/MultipleOrdersCancellationModal/index.tsx
+++ b/src/common/containers/MultipleOrdersCancellationModal/index.tsx
@@ -12,7 +12,7 @@ import { useWalletInfo } from 'modules/wallet'
 
 import { ordersToCancelAtom, updateOrdersToCancelAtom } from 'common/hooks/useMultipleOrdersCancellation/state'
 import { useCancelMultipleOrders } from 'common/hooks/useMultipleOrdersCancellation/useCancelMultipleOrders'
-import { GpModal as Modal } from 'common/pure/Modal'
+import { CowModal as Modal } from 'common/pure/Modal'
 import { TransactionErrorContent } from 'common/pure/TransactionErrorContent'
 
 interface Props {
diff --git a/src/common/containers/ZeroApprovalModal/ZeroApprovalModal.tsx b/src/common/containers/ZeroApprovalModal/ZeroApprovalModal.tsx
index 64ae2ec38f..7cce503f84 100644
--- a/src/common/containers/ZeroApprovalModal/ZeroApprovalModal.tsx
+++ b/src/common/containers/ZeroApprovalModal/ZeroApprovalModal.tsx
@@ -3,7 +3,7 @@ import { useCallback, useEffect, useState } from 'react'
 import { useWalletDetails, useWalletDisplayedAddress } from 'modules/wallet'
 
 import { ConfirmationPendingContent } from 'common/pure/ConfirmationPendingContent'
-import { GpModal } from 'common/pure/Modal'
+import { CowModal } from 'common/pure/Modal'
 import { useZeroApprovalState } from 'common/state/useZeroApprovalState'
 
 import { useWalletStatusIcon } from '../../hooks/useWalletStatusIcon'
@@ -36,7 +36,7 @@ export function ZeroApprovalModal({ onDismiss = () => {} }: ZeroApprovalModalPro
   const symbol = currency?.symbol?.toUpperCase() ?? 'Unknown Currency' // This should never happen.
 
   return (
-    <GpModal isOpen={shouldShow} onDismiss={handleDismiss}>
+    <CowModal isOpen={shouldShow} onDismiss={handleDismiss}>
       <ConfirmationPendingContent
         onDismiss={handleDismiss}
         statusIcon={statusIcon}
@@ -51,6 +51,6 @@ export function ZeroApprovalModal({ onDismiss = () => {} }: ZeroApprovalModalPro
         walletAddress={walletAddress}
         operationLabel="token approval"
       />
-    </GpModal>
+    </CowModal>
   )
 }
diff --git a/src/common/pure/CancellationModal/index.tsx b/src/common/pure/CancellationModal/index.tsx
index d959310231..c2782961e3 100644
--- a/src/common/pure/CancellationModal/index.tsx
+++ b/src/common/pure/CancellationModal/index.tsx
@@ -5,7 +5,7 @@ import { LegacyConfirmationPendingContent } from 'legacy/components/TransactionC
 import { shortenOrderId } from 'legacy/utils'
 
 import { CancellationModalContext } from 'common/hooks/useCancelOrder/state'
-import { GpModal as Modal } from 'common/pure/Modal'
+import { CowModal as Modal } from 'common/pure/Modal'
 import { TransactionErrorContent } from 'common/pure/TransactionErrorContent'
 
 import { RequestCancellationModal } from './RequestCancellationModal'
diff --git a/src/common/pure/ConfirmationModal/ConfirmationModal.tsx b/src/common/pure/ConfirmationModal/ConfirmationModal.tsx
index ceb05e1a5e..7a01bf4dc5 100644
--- a/src/common/pure/ConfirmationModal/ConfirmationModal.tsx
+++ b/src/common/pure/ConfirmationModal/ConfirmationModal.tsx
@@ -1,7 +1,7 @@
 import { Trans } from '@lingui/macro'
 import styled from 'styled-components/macro'
 
-import Modal, { ContentWrapper } from 'common/pure/Modal'
+import { ContentWrapper, Modal } from 'common/pure/Modal'
 
 import { ConfirmationModalHeader } from './ConfirmationModalHeader'
 
diff --git a/src/common/pure/ConfirmationPendingContent/ConfirmationPendingContent.cosmos.tsx b/src/common/pure/ConfirmationPendingContent/ConfirmationPendingContent.cosmos.tsx
index c296235f67..c5ff82c2ad 100644
--- a/src/common/pure/ConfirmationPendingContent/ConfirmationPendingContent.cosmos.tsx
+++ b/src/common/pure/ConfirmationPendingContent/ConfirmationPendingContent.cosmos.tsx
@@ -2,11 +2,11 @@ import { Identicon } from 'modules/wallet'
 
 import { ConfirmationPendingContent } from './ConfirmationPendingContent'
 
-import { GpModal } from '../Modal'
+import { CowModal } from '../Modal'
 
 const Fixtures = {
   default: (
-    <GpModal onDismiss={console.log} isOpen={true}>
+    <CowModal onDismiss={console.log} isOpen={true}>
       <ConfirmationPendingContent
         onDismiss={() => alert('dismiss')}
         statusIcon={<Identicon size={56} />}
@@ -20,7 +20,7 @@ const Fixtures = {
         walletAddress="walletAddress"
         operationLabel="token approval"
       />
-    </GpModal>
+    </CowModal>
   ),
 }
 
diff --git a/src/common/pure/ExpertModeModal/index.tsx b/src/common/pure/ExpertModeModal/index.tsx
index fcddaac024..4c122fd84f 100644
--- a/src/common/pure/ExpertModeModal/index.tsx
+++ b/src/common/pure/ExpertModeModal/index.tsx
@@ -2,7 +2,7 @@ import { Trans } from '@lingui/macro'
 import { X } from 'react-feather'
 import styled from 'styled-components/macro'
 
-import Modal from 'common/pure/Modal'
+import { Modal } from 'common/pure/Modal'
 
 import { ConfirmedButton } from '../ConfirmedButton'
 
diff --git a/src/common/pure/Modal/index.ts b/src/common/pure/Modal/index.ts
deleted file mode 100644
index 28765db798..0000000000
--- a/src/common/pure/Modal/index.ts
+++ /dev/null
@@ -1,105 +0,0 @@
-import styled from 'styled-components/macro'
-
-import Modal from './ModalMod'
-
-export * from './ModalMod'
-export { default } from './ModalMod'
-
-export const HeaderRow = styled.div`
-  ${({ theme }) => theme.flexRowNoWrap};
-  padding: 1rem 1rem;
-  font-weight: 500;
-  color: ${(props) => (props.color === 'blue' ? ({ theme }) => theme.primary1 : 'inherit')};
-  ${({ theme }) => theme.mediaWidth.upToMedium`
-    padding: 1rem;
-  `};
-`
-
-export const CloseIcon = styled.div`
-  position: absolute;
-  right: 1rem;
-  top: 14px;
-  &:hover {
-    cursor: pointer;
-    opacity: 0.6;
-  }
-`
-
-export const HoverText = styled.div`
-  text-decoration: none;
-  color: ${({ theme }) => theme.text1};
-  display: flex;
-  align-items: center;
-
-  :hover {
-    cursor: pointer;
-  }
-`
-
-export const ContentWrapper = styled.div`
-  /* background-color: ${({ theme }) => theme.bg0}; */
-  background-color: ${({ theme }) => theme.bg1};
-  padding: 0 1rem 1rem 1rem;
-  border-bottom-left-radius: 20px;
-  border-bottom-right-radius: 20px;
-  ${({ theme }) => theme.mediaWidth.upToMedium`padding: 0 1rem 1rem 1rem`};
-`
-
-export const GpModal = styled(Modal)<{
-  maxWidth?: number | string
-  backgroundColor?: string
-  border?: string
-  padding?: string
-}>`
-  > [data-reach-dialog-content] {
-    color: ${({ theme }) => theme.text1};
-    width: 100%;
-    max-width: ${({ maxWidth = 470 }) => `${maxWidth}px`};
-    border: ${({ border = 'inherit' }) => `${border}`};
-    z-index: 100;
-    padding: ${({ padding = '0px' }) => `${padding}`};
-    margin: auto;
-    transition: max-width 0.4s ease;
-    background-color: ${({ theme }) => theme.bg1};
-    overflow: hidden;
-
-    ${({ theme }) => theme.mediaWidth.upToSmall`
-      max-height: 100vh;
-      max-width: 100%;
-      height: 100%;
-      width: 100vw;
-      border-radius: 0;
-    `}
-
-    ${HeaderRow} {
-      ${({ theme }) => theme.mediaWidth.upToSmall`
-        position: fixed;
-        top: 0;
-        left: 0;
-        width: 100%;
-        padding: 16px;
-        background: ${({ theme }) => theme.bg1};
-        z-index: 20;
-      `}
-    }
-
-    ${CloseIcon} {
-      ${({ theme }) => theme.mediaWidth.upToSmall`
-        z-index: 21;
-        position: fixed;
-      `}
-    }
-
-    ${HoverText} {
-      ${({ theme }) => theme.mediaWidth.upToSmall`
-        white-space: nowrap;
-      `}
-    }
-
-    ${ContentWrapper} {
-      ${({ theme }) => theme.mediaWidth.upToSmall`
-        margin: 62px auto 0;
-      `}
-    }
-  }
-`
diff --git a/src/common/pure/Modal/ModalMod.tsx b/src/common/pure/Modal/index.tsx
similarity index 52%
rename from src/common/pure/Modal/ModalMod.tsx
rename to src/common/pure/Modal/index.tsx
index ecdfda516c..72ab1d0aca 100644
--- a/src/common/pure/Modal/ModalMod.tsx
+++ b/src/common/pure/Modal/index.tsx
@@ -1,80 +1,14 @@
 import React from 'react'
 
-import { DialogContent, DialogOverlay } from '@reach/dialog'
-import { animated, useSpringValue, useTransition } from '@react-spring/web'
+import { useSpringValue, useTransition } from '@react-spring/web'
 import { useGesture } from '@use-gesture/react'
-import { transparentize } from 'polished'
-import styled, { css } from 'styled-components/macro'
+import styled from 'styled-components/macro'
 
 import { isMobile } from 'legacy/utils/userAgent'
 
-const AnimatedDialogOverlay = animated(DialogOverlay)
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-const StyledDialogOverlay = styled(AnimatedDialogOverlay)`
-  &[data-reach-dialog-overlay] {
-    z-index: 2;
-    background-color: transparent;
-    overflow: hidden;
-
-    display: flex;
-    align-items: center;
-    justify-content: center;
-
-    background-color: ${({ theme }) => theme.modalBG};
-  }
-`
-
-const AnimatedDialogContent = animated(DialogContent)
-// destructure to not pass custom props to Dialog DOM element
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-const StyledDialogContent = styled(({ ...rest }) => <AnimatedDialogContent {...rest} />).attrs({
-  'aria-label': 'dialog',
-})`
-  overflow-y: auto;
-
-  &[data-reach-dialog-content] {
-    margin: 0 0 2rem 0;
-    background-color: ${({ theme }) => theme.bg0};
-    border: 1px solid ${({ theme }) => theme.bg1};
-    box-shadow: 0 4px 8px 0 ${({ theme }) => transparentize(0.95, theme.shadow1)};
-    padding: 0px;
-    width: 50vw;
-    overflow-y: auto;
-    overflow-x: hidden;
-
-    align-self: ${({ mobile }) => (mobile ? 'flex-end' : 'center')};
+import { CloseIcon, ContentWrapper, HeaderRow, HoverText, StyledDialogContent, StyledDialogOverlay } from './styled'
 
-    max-width: 420px;
-    ${({ maxHeight }) =>
-      maxHeight &&
-      css`
-        max-height: ${maxHeight}vh;
-      `}
-    ${({ minHeight }) =>
-      minHeight &&
-      css`
-        min-height: ${minHeight}vh;
-      `}
-    display: flex;
-    border-radius: 20px;
-    ${({ theme }) => theme.mediaWidth.upToMedium`
-      width: 65vw;
-      margin: 0;
-    `}
-    ${({ theme, mobile }) => theme.mediaWidth.upToSmall`
-      width:  85vw;
-      ${
-        mobile &&
-        css`
-          width: 100vw;
-          border-radius: 20px;
-          border-bottom-left-radius: 0;
-          border-bottom-right-radius: 0;
-        `
-      }
-    `}
-  }
-`
+export * from './styled'
 
 interface ModalProps {
   isOpen: boolean
@@ -86,7 +20,7 @@ interface ModalProps {
   children?: React.ReactNode
 }
 
-export default function Modal({
+export function Modal({
   isOpen,
   onDismiss,
   minHeight = false,
@@ -148,3 +82,62 @@ export default function Modal({
     </>
   )
 }
+
+export const CowModal = styled(Modal)<{
+  maxWidth?: number | string
+  backgroundColor?: string
+  border?: string
+  padding?: string
+}>`
+  > [data-reach-dialog-content] {
+    color: ${({ theme }) => theme.text1};
+    width: 100%;
+    max-width: ${({ maxWidth = 470 }) => `${maxWidth}px`};
+    border: ${({ border = 'inherit' }) => `${border}`};
+    z-index: 100;
+    padding: ${({ padding = '0px' }) => `${padding}`};
+    margin: auto;
+    transition: max-width 0.4s ease;
+    background-color: ${({ theme }) => theme.bg1};
+    overflow: hidden;
+
+    ${({ theme }) => theme.mediaWidth.upToSmall`
+      max-height: 100vh;
+      max-width: 100%;
+      height: 100%;
+      width: 100vw;
+      border-radius: 0;
+    `}
+
+    ${HeaderRow} {
+      ${({ theme }) => theme.mediaWidth.upToSmall`
+        position: fixed;
+        top: 0;
+        left: 0;
+        width: 100%;
+        padding: 16px;
+        background: ${({ theme }) => theme.bg1};
+        z-index: 20;
+      `}
+    }
+
+    ${CloseIcon} {
+      ${({ theme }) => theme.mediaWidth.upToSmall`
+        z-index: 21;
+        position: fixed;
+      `}
+    }
+
+    ${HoverText} {
+      ${({ theme }) => theme.mediaWidth.upToSmall`
+        white-space: nowrap;
+      `}
+    }
+
+    ${ContentWrapper} {
+      ${({ theme }) => theme.mediaWidth.upToSmall`
+        margin: 62px auto 0;
+      `}
+    }
+  }
+`
diff --git a/src/common/pure/Modal/styled.tsx b/src/common/pure/Modal/styled.tsx
new file mode 100644
index 0000000000..b1a784936d
--- /dev/null
+++ b/src/common/pure/Modal/styled.tsx
@@ -0,0 +1,113 @@
+import React from 'react'
+
+import { DialogContent, DialogOverlay } from '@reach/dialog'
+import { animated } from '@react-spring/web'
+import { transparentize } from 'polished'
+import styled, { css } from 'styled-components/macro'
+
+export const HeaderRow = styled.div`
+  ${({ theme }) => theme.flexRowNoWrap};
+  padding: 1rem 1rem;
+  font-weight: 500;
+  color: ${(props) => (props.color === 'blue' ? ({ theme }) => theme.primary1 : 'inherit')};
+  ${({ theme }) => theme.mediaWidth.upToMedium`
+    padding: 1rem;
+  `};
+`
+
+export const CloseIcon = styled.div`
+  position: absolute;
+  right: 1rem;
+  top: 14px;
+  &:hover {
+    cursor: pointer;
+    opacity: 0.6;
+  }
+`
+
+export const HoverText = styled.div`
+  text-decoration: none;
+  color: ${({ theme }) => theme.text1};
+  display: flex;
+  align-items: center;
+
+  :hover {
+    cursor: pointer;
+  }
+`
+
+export const ContentWrapper = styled.div`
+  /* background-color: ${({ theme }) => theme.bg0}; */
+  background-color: ${({ theme }) => theme.bg1};
+  padding: 0 1rem 1rem 1rem;
+  border-bottom-left-radius: 20px;
+  border-bottom-right-radius: 20px;
+  ${({ theme }) => theme.mediaWidth.upToMedium`padding: 0 1rem 1rem 1rem`};
+`
+
+const AnimatedDialogOverlay = animated(DialogOverlay)
+export const StyledDialogOverlay = styled(AnimatedDialogOverlay)`
+  &[data-reach-dialog-overlay] {
+    z-index: 2;
+    background-color: transparent;
+    overflow: hidden;
+
+    display: flex;
+    align-items: center;
+    justify-content: center;
+
+    background-color: ${({ theme }) => theme.modalBG};
+  }
+`
+
+const AnimatedDialogContent = animated(DialogContent)
+// destructure to not pass custom props to Dialog DOM element
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+export const StyledDialogContent = styled(({ ...rest }) => <AnimatedDialogContent {...rest} />).attrs({
+  'aria-label': 'dialog',
+})`
+  overflow-y: auto;
+
+  &[data-reach-dialog-content] {
+    margin: 0 0 2rem 0;
+    background-color: ${({ theme }) => theme.bg0};
+    border: 1px solid ${({ theme }) => theme.bg1};
+    box-shadow: 0 4px 8px 0 ${({ theme }) => transparentize(0.95, theme.shadow1)};
+    padding: 0px;
+    width: 50vw;
+    overflow-y: auto;
+    overflow-x: hidden;
+
+    align-self: ${({ mobile }) => (mobile ? 'flex-end' : 'center')};
+
+    max-width: 420px;
+    ${({ maxHeight }) =>
+      maxHeight &&
+      css`
+        max-height: ${maxHeight}vh;
+      `}
+    ${({ minHeight }) =>
+      minHeight &&
+      css`
+        min-height: ${minHeight}vh;
+      `}
+    display: flex;
+    border-radius: 20px;
+    ${({ theme }) => theme.mediaWidth.upToMedium`
+      width: 65vw;
+      margin: 0;
+    `}
+    ${({ theme, mobile }) => theme.mediaWidth.upToSmall`
+      width:  85vw;
+      ${
+        mobile &&
+        css`
+          width: 100vw;
+          border-radius: 20px;
+          border-bottom-left-radius: 0;
+          border-bottom-right-radius: 0;
+        `
+      }
+    `}
+  }
+`
diff --git a/src/common/pure/TransactionSubmittedContent/SurplusModal.tsx b/src/common/pure/TransactionSubmittedContent/SurplusModal.tsx
index c820a2c479..5aeeee63fb 100644
--- a/src/common/pure/TransactionSubmittedContent/SurplusModal.tsx
+++ b/src/common/pure/TransactionSubmittedContent/SurplusModal.tsx
@@ -20,12 +20,6 @@ import { TokenAmount } from 'common/pure/TokenAmount'
 const SELL_SURPLUS_WORD = 'got'
 const BUY_SURPLUS_WORD = 'saved'
 
-function getTwitterText(surplusAmount: string, surplusToken: string, orderKind: OrderKind) {
-  const actionWord = orderKind === OrderKind.SELL ? SELL_SURPLUS_WORD : BUY_SURPLUS_WORD
-  const surplus = `${surplusAmount} ${surplusToken}`
-  return encodeURIComponent(`Hey, I just ${actionWord} ${surplus} on @CoWSwap! 🐮💸\n\nStart swapping on swap.cow.fi`)
-}
-
 export const Wrapper = styled.div`
   --borderRadius: 16px;
   display: flex;
@@ -202,3 +196,11 @@ export function SurplusModal(props: SurplusModalProps) {
     </Wrapper>
   )
 }
+
+function getTwitterText(surplusAmount: string, surplusToken: string, orderKind: OrderKind) {
+  const actionWord = orderKind === OrderKind.SELL ? SELL_SURPLUS_WORD : BUY_SURPLUS_WORD
+  const surplus = `${surplusAmount} ${surplusToken}`
+  return encodeURIComponent(
+    `Hey, I just ${actionWord} an extra ${surplus} on @CoWSwap! 🐮💸\n\nStart swapping on swap.cow.fi`
+  )
+}
diff --git a/src/legacy/components/CowSubsidyModal/index.tsx b/src/legacy/components/CowSubsidyModal/index.tsx
index fbafc9a4bc..b31882b08b 100644
--- a/src/legacy/components/CowSubsidyModal/index.tsx
+++ b/src/legacy/components/CowSubsidyModal/index.tsx
@@ -1,6 +1,6 @@
 import { useCallback } from 'react'
 
-import { CurrencyAmount, Currency } from '@uniswap/sdk-core'
+import { Currency, CurrencyAmount } from '@uniswap/sdk-core'
 
 import { Text } from 'rebass'
 
@@ -9,14 +9,14 @@ import { ExternalLink } from 'legacy/components/Link'
 import Row from 'legacy/components/Row'
 import { ConfirmationModalProps } from 'legacy/components/TransactionConfirmationModal'
 import {
-  LegacyConfirmationModalContent,
   ConfirmationModalContentProps,
+  LegacyConfirmationModalContent,
 } from 'legacy/components/TransactionConfirmationModal/LegacyConfirmationModalContent'
 import useCowBalanceAndSubsidy from 'legacy/hooks/useCowBalanceAndSubsidy'
 
 import { useWalletInfo } from 'modules/wallet'
 
-import { GpModal } from 'common/pure/Modal'
+import { CowModal } from 'common/pure/Modal'
 
 import { SUBSIDY_INFO_MESSAGE } from './constants'
 import SubsidyTable from './SubsidyTable'
@@ -70,7 +70,7 @@ export default function CowSubsidyModal({
 
   // TODO: use TradeConfirmModal
   return (
-    <GpModal isOpen={isOpen} onDismiss={onDismiss} maxHeight={90} maxWidth={500} padding={'12px 0 18px'}>
+    <CowModal isOpen={isOpen} onDismiss={onDismiss} maxHeight={90} maxWidth={500} padding={'12px 0 18px'}>
       <LegacyConfirmationModalContent
         {...restProps}
         title="CoWmunity fees discount"
@@ -80,6 +80,6 @@ export default function CowSubsidyModal({
         topContent={TopContent}
         bottomContent={BottomContent}
       />
-    </GpModal>
+    </CowModal>
   )
 }
diff --git a/src/legacy/components/SearchModal/CurrencySearchModal.tsx b/src/legacy/components/SearchModal/CurrencySearchModal.tsx
index 5f3ebea791..403c1540a4 100644
--- a/src/legacy/components/SearchModal/CurrencySearchModal.tsx
+++ b/src/legacy/components/SearchModal/CurrencySearchModal.tsx
@@ -11,7 +11,7 @@ import Manage from 'legacy/components/SearchModal/Manage'
 import usePrevious from 'legacy/hooks/usePrevious'
 import { WrappedTokenInfo } from 'legacy/state/lists/wrappedTokenInfo'
 
-import { GpModal as Modal } from 'common/pure/Modal'
+import { CowModal as Modal } from 'common/pure/Modal'
 
 import useLast from '../../hooks/useLast'
 
diff --git a/src/legacy/components/TokenWarningModal/index.tsx b/src/legacy/components/TokenWarningModal/index.tsx
index cad7122c07..acbc069526 100644
--- a/src/legacy/components/TokenWarningModal/index.tsx
+++ b/src/legacy/components/TokenWarningModal/index.tsx
@@ -2,7 +2,7 @@ import { Token } from '@uniswap/sdk-core'
 
 import { ImportToken } from 'legacy/components/SearchModal/ImportToken'
 
-import Modal from 'common/pure/Modal'
+import { Modal } from 'common/pure/Modal'
 
 export default function TokenWarningModal({
   isOpen,
diff --git a/src/legacy/components/TransactionConfirmationModal/index.tsx b/src/legacy/components/TransactionConfirmationModal/index.tsx
index e53d520741..8a3e922cec 100644
--- a/src/legacy/components/TransactionConfirmationModal/index.tsx
+++ b/src/legacy/components/TransactionConfirmationModal/index.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode } from 'react'
+import React, { ReactNode, useCallback, useEffect } from 'react'
 
 import { Currency } from '@uniswap/sdk-core'
 
@@ -7,9 +7,10 @@ import { useMultipleActivityDescriptors } from 'legacy/hooks/useRecentActivity'
 import { handleFollowPendingTxPopupAtom, useUpdateAtom } from 'legacy/state/application/atoms'
 
 import { ActivityDerivedState } from 'modules/account/containers/Transaction'
+import { setIsConfirmationModalOpenAtom } from 'modules/swap/state/surplusModal'
 import { useWalletInfo } from 'modules/wallet'
 
-import { GpModal } from 'common/pure/Modal'
+import { CowModal } from 'common/pure/Modal'
 import { TransactionSubmittedContent } from 'common/pure/TransactionSubmittedContent'
 
 import { LegacyConfirmationPendingContent } from './LegacyConfirmationPendingContent'
@@ -23,7 +24,7 @@ export interface ConfirmationModalProps {
   hash?: string | undefined
   content?: () => ReactNode
   attemptingTxn: boolean
-  pendingText: ReactNode
+  pendingText?: ReactNode
   currencyToAdd?: Currency | undefined
   operationType: ConfirmOperationType
 }
@@ -43,20 +44,30 @@ export function TransactionConfirmationModal({
   const activities = useMultipleActivityDescriptors({ chainId, ids: [hash || ''] }) || []
   const activityDerivedState = useActivityDerivedState({ chainId, activity: activities[0] })
 
+  const setIsConfirmationModalOpen = useUpdateAtom(setIsConfirmationModalOpenAtom)
+
+  useEffect(() => setIsConfirmationModalOpen(isOpen && !!hash), [hash, isOpen, setIsConfirmationModalOpen])
+
+  const _onDismiss = useCallback(() => {
+    setIsConfirmationModalOpen(false)
+
+    const onDismissFn =
+      !attemptingTxn && hash
+        ? () => {
+            setShowFollowPendingTxPopup(true)
+            onDismiss()
+          }
+        : onDismiss
+
+    onDismissFn()
+  }, [attemptingTxn, hash, onDismiss, setIsConfirmationModalOpen, setShowFollowPendingTxPopup])
+
   if (!chainId) return null
 
   const width = getWidth(hash, activityDerivedState)
 
-  const _onDismiss =
-    !attemptingTxn && hash
-      ? () => {
-          setShowFollowPendingTxPopup(true)
-          onDismiss()
-        }
-      : onDismiss
-
   return (
-    <GpModal isOpen={isOpen} onDismiss={_onDismiss} maxHeight={90} maxWidth={width}>
+    <CowModal isOpen={isOpen} onDismiss={_onDismiss} maxHeight={90} maxWidth={width}>
       {attemptingTxn ? (
         <LegacyConfirmationPendingContent
           chainId={chainId}
@@ -75,7 +86,7 @@ export function TransactionConfirmationModal({
       ) : (
         content?.()
       )}
-    </GpModal>
+    </CowModal>
   )
 }
 
diff --git a/src/legacy/components/swap/UnsupportedCurrencyFooter/UnsupportedCurrencyFooterMod.tsx b/src/legacy/components/swap/UnsupportedCurrencyFooter/UnsupportedCurrencyFooterMod.tsx
index c20278188b..03d8f7b691 100644
--- a/src/legacy/components/swap/UnsupportedCurrencyFooter/UnsupportedCurrencyFooterMod.tsx
+++ b/src/legacy/components/swap/UnsupportedCurrencyFooter/UnsupportedCurrencyFooterMod.tsx
@@ -16,7 +16,7 @@ import { getEtherscanLink } from 'legacy/utils'
 import { useWalletInfo } from 'modules/wallet'
 
 import { CurrencyLogo } from 'common/pure/CurrencyLogo'
-import Modal from 'common/pure/Modal'
+import { Modal } from 'common/pure/Modal'
 
 export const DetailsFooter = styled.div<{ show: boolean }>`
   padding-top: calc(16px + 2rem);
diff --git a/src/legacy/hooks/useTransactionErrorModal.tsx b/src/legacy/hooks/useTransactionErrorModal.tsx
index f32ee57c88..139891b2e7 100644
--- a/src/legacy/hooks/useTransactionErrorModal.tsx
+++ b/src/legacy/hooks/useTransactionErrorModal.tsx
@@ -1,9 +1,9 @@
 import { useCallback } from 'react'
 
-import { useOpenModal, useCloseModals, useModalIsOpen } from 'legacy/state/application/hooks'
+import { useCloseModals, useModalIsOpen, useOpenModal } from 'legacy/state/application/hooks'
 import { ApplicationModal } from 'legacy/state/application/reducer'
 
-import { GpModal } from 'common/pure/Modal'
+import { CowModal } from 'common/pure/Modal'
 import { TransactionErrorContent } from 'common/pure/TransactionErrorContent'
 
 export default function useTransactionErrorModal() {
@@ -16,9 +16,9 @@ export default function useTransactionErrorModal() {
     closeModal,
     TransactionErrorModal: useCallback(
       ({ message, onDismiss }: { message?: string; onDismiss: () => void }) => (
-        <GpModal isOpen={!!message && showTransactionErrorModal} onDismiss={closeModal}>
+        <CowModal isOpen={!!message && showTransactionErrorModal} onDismiss={closeModal}>
           <TransactionErrorContent onDismiss={onDismiss} message={message || ''} />
-        </GpModal>
+        </CowModal>
       ),
       [closeModal, showTransactionErrorModal]
     ),
diff --git a/src/legacy/state/index.ts b/src/legacy/state/index.ts
index 9753401e91..ebd587fb6a 100644
--- a/src/legacy/state/index.ts
+++ b/src/legacy/state/index.ts
@@ -59,7 +59,7 @@ const store = configureStore({
   preloadedState: load({ states: PERSISTED_KEYS, disableWarnings: process.env.NODE_ENV === 'test' }),
 })
 
-// this instantiate the app / reducers in several places using the default chainId
+// this instantiates the app / reducers in several places using the default chainId
 store.dispatch(updateVersion({ chainId: DEFAULT_NETWORK_FOR_LISTS }))
 
 // TODO: this is new, should we enable it?
diff --git a/src/legacy/state/orders/actions.ts b/src/legacy/state/orders/actions.ts
index 4c58edb276..773a9b98d6 100644
--- a/src/legacy/state/orders/actions.ts
+++ b/src/legacy/state/orders/actions.ts
@@ -1,5 +1,4 @@
-import { UID, EnrichedOrder, OrderClass, OrderCreation } from '@cowprotocol/cow-sdk'
-import { SupportedChainId as ChainId } from '@cowprotocol/cow-sdk'
+import { EnrichedOrder, OrderClass, OrderCreation, SupportedChainId as ChainId, UID } from '@cowprotocol/cow-sdk'
 import { BigNumberish } from '@ethersproject/bignumber'
 import { SafeMultisigTransactionResponse } from '@safe-global/safe-core-sdk-types'
 import { Token } from '@uniswap/sdk-core'
@@ -103,6 +102,7 @@ export type OrderInfoApi = Pick<
   | 'invalidated'
   | 'ethflowData'
   | 'onchainOrderData'
+  | 'class'
 >
 
 /**
diff --git a/src/legacy/state/orders/updaters/CancelledOrdersUpdater.ts b/src/legacy/state/orders/updaters/CancelledOrdersUpdater.ts
index ffa54afdb4..d691c02354 100644
--- a/src/legacy/state/orders/updaters/CancelledOrdersUpdater.ts
+++ b/src/legacy/state/orders/updaters/CancelledOrdersUpdater.ts
@@ -10,6 +10,7 @@ import { fetchOrderPopupData, OrderLogPopupMixData } from 'legacy/state/orders/u
 import { OrderTransitionStatus } from 'legacy/state/orders/utils'
 import { supportedChainId } from 'legacy/utils/supportedChainId'
 
+import { useAddOrderToSurplusQueue } from 'modules/swap/state/surplusModal'
 import { useWalletInfo } from 'modules/wallet'
 
 /**
@@ -31,6 +32,7 @@ export function CancelledOrdersUpdater(): null {
   const chainId = supportedChainId(_chainId)
 
   const cancelled = useCancelledOrders({ chainId })
+  const addOrderToSurplusQueue = useAddOrderToSurplusQueue()
 
   // Ref, so we don't rerun useEffect
   const cancelledRef = useRef(cancelled)
@@ -102,17 +104,20 @@ export function CancelledOrdersUpdater(): null {
         )
 
         // Bach state update fulfilled orders, if any
-        fulfilled.length > 0 &&
+        if (fulfilled.length) {
+          const ordersData = fulfilled as OrderFulfillmentData[]
           fulfillOrdersBatch({
-            ordersData: fulfilled as OrderFulfillmentData[],
+            ordersData,
             chainId,
           })
+          ordersData.forEach(({ id }) => addOrderToSurplusQueue(id))
+        }
       } finally {
         isUpdating.current = false
         // console.debug(`[CancelledOrdersUpdater] Checked recently canceled orders in ${Date.now() - startTime}ms`)
       }
     },
-    [fulfillOrdersBatch]
+    [addOrderToSurplusQueue, fulfillOrdersBatch]
   )
 
   useEffect(() => {
diff --git a/src/legacy/state/orders/updaters/PendingOrdersUpdater.ts b/src/legacy/state/orders/updaters/PendingOrdersUpdater.ts
index d37e057cba..62fbd0db19 100644
--- a/src/legacy/state/orders/updaters/PendingOrdersUpdater.ts
+++ b/src/legacy/state/orders/updaters/PendingOrdersUpdater.ts
@@ -1,8 +1,7 @@
 import { useUpdateAtom } from 'jotai/utils'
 import { useCallback, useEffect, useRef } from 'react'
 
-import { SupportedChainId as ChainId } from '@cowprotocol/cow-sdk'
-import { OrderClass, EthflowData } from '@cowprotocol/cow-sdk'
+import { EthflowData, OrderClass, SupportedChainId as ChainId } from '@cowprotocol/cow-sdk'
 
 import { GetSafeInfo, useGetSafeInfo } from 'legacy/hooks/useGetSafeInfo'
 import { FulfillOrdersBatchParams, Order, OrderFulfillmentData, OrderStatus } from 'legacy/state/orders/actions'
@@ -16,9 +15,9 @@ import {
   UpdatePresignGnosisSafeTxCallback,
   useAddOrUpdateOrders,
   useCancelOrdersBatch,
+  useCombinedPendingOrders,
   useExpireOrdersBatch,
   useFulfillOrdersBatch,
-  useCombinedPendingOrders,
   usePresignOrders,
   useUpdatePresignGnosisSafeTx,
 } from 'legacy/state/orders/hooks'
@@ -28,6 +27,7 @@ import { isOrderInPendingTooLong, openNpsAppziSometimes } from 'legacy/utils/app
 import { getExplorerOrderLink } from 'legacy/utils/explorer'
 import { supportedChainId } from 'legacy/utils/supportedChainId'
 
+import { useAddOrderToSurplusQueue } from 'modules/swap/state/surplusModal'
 import { useWalletInfo } from 'modules/wallet'
 
 import { getOrder, OrderID } from 'api/gnosisProtocol'
@@ -142,6 +142,7 @@ interface UpdateOrdersParams {
   expireOrdersBatch: ExpireOrdersBatchCallback
   cancelOrdersBatch: CancelOrdersBatchCallback
   presignOrders: PresignOrdersCallback
+  addOrderToSurplusQueue: (orderId: string) => void
   updatePresignGnosisSafeTx: UpdatePresignGnosisSafeTxCallback
   getSafeInfo: GetSafeInfo
 }
@@ -156,6 +157,7 @@ async function _updateOrders({
   expireOrdersBatch,
   cancelOrdersBatch,
   presignOrders,
+  addOrderToSurplusQueue,
   updatePresignGnosisSafeTx,
   getSafeInfo,
 }: UpdateOrdersParams): Promise<void> {
@@ -217,10 +219,18 @@ async function _updateOrders({
   }
 
   if (fulfilled.length > 0) {
+    const fulfilledOrders = fulfilled as OrderFulfillmentData[]
+    // update redux state
     fulfillOrdersBatch({
-      ordersData: fulfilled as OrderFulfillmentData[],
+      ordersData: fulfilledOrders,
       chainId,
     })
+    // add to surplus queue
+    fulfilledOrders.forEach(({ id, apiAdditionalInfo }) => {
+      if (!apiAdditionalInfo || apiAdditionalInfo.class === OrderClass.MARKET) {
+        addOrderToSurplusQueue(id)
+      }
+    })
   }
 
   // Update the presign Gnosis Safe Tx info (if applies)
@@ -267,6 +277,7 @@ export function PendingOrdersUpdater(): null {
   const cancelOrdersBatch = useCancelOrdersBatch()
   const addOrUpdateOrders = useAddOrUpdateOrders()
   const presignOrders = usePresignOrders()
+  const addOrderToSurplusQueue = useAddOrderToSurplusQueue()
   const updatePresignGnosisSafeTx = useUpdatePresignGnosisSafeTx()
   const getSafeInfo = useGetSafeInfo()
 
@@ -298,6 +309,7 @@ export function PendingOrdersUpdater(): null {
           expireOrdersBatch,
           cancelOrdersBatch,
           presignOrders,
+          addOrderToSurplusQueue,
           updatePresignGnosisSafeTx,
           getSafeInfo,
         }).finally(() => {
@@ -312,6 +324,7 @@ export function PendingOrdersUpdater(): null {
       expireOrdersBatch,
       cancelOrdersBatch,
       presignOrders,
+      addOrderToSurplusQueue,
       updatePresignGnosisSafeTx,
       getSafeInfo,
     ]
diff --git a/src/modules/account/pure/ConnectedAccountBlocked/index.tsx b/src/modules/account/pure/ConnectedAccountBlocked/index.tsx
index 6b8500662c..56ddce4e84 100644
--- a/src/modules/account/pure/ConnectedAccountBlocked/index.tsx
+++ b/src/modules/account/pure/ConnectedAccountBlocked/index.tsx
@@ -8,7 +8,7 @@ import { ExternalLink, ThemedText } from 'legacy/theme'
 
 import { CopyHelper } from 'modules/account/containers/CopyHelper'
 
-import Modal from 'common/pure/Modal'
+import { Modal } from 'common/pure/Modal'
 
 const ContentWrapper = styled(Column)`
   align-items: center;
diff --git a/src/modules/limitOrders/pure/DeadlineSelector/index.tsx b/src/modules/limitOrders/pure/DeadlineSelector/index.tsx
index b68888fcd5..be050ea38d 100644
--- a/src/modules/limitOrders/pure/DeadlineSelector/index.tsx
+++ b/src/modules/limitOrders/pure/DeadlineSelector/index.tsx
@@ -1,5 +1,4 @@
-import { useEffect, useState } from 'react'
-import { ChangeEventHandler, useCallback, useMemo, useRef } from 'react'
+import { ChangeEventHandler, useCallback, useEffect, useMemo, useRef, useState } from 'react'
 
 import { Trans } from '@lingui/macro'
 import { Menu } from '@reach/menu-button'
@@ -15,7 +14,7 @@ import {
   limitDateString,
 } from 'modules/limitOrders/pure/DeadlineSelector/utils'
 
-import { GpModal as Modal } from 'common/pure/Modal'
+import { CowModal as Modal } from 'common/pure/Modal'
 
 import { LimitOrderDeadline, limitOrdersDeadlines } from './deadlines'
 import * as styledEl from './styled'
diff --git a/src/modules/ordersTable/pure/ReceiptModal/index.tsx b/src/modules/ordersTable/pure/ReceiptModal/index.tsx
index 0edf3564d1..d1dfce76e3 100644
--- a/src/modules/ordersTable/pure/ReceiptModal/index.tsx
+++ b/src/modules/ordersTable/pure/ReceiptModal/index.tsx
@@ -7,7 +7,7 @@ import { CloseIcon } from 'legacy/theme'
 import { TwapOrderItem } from 'modules/twap/types'
 
 import { InlineBanner } from 'common/pure/InlineBanner'
-import { GpModal } from 'common/pure/Modal'
+import { CowModal } from 'common/pure/Modal'
 import { getSellAmountWithFee } from 'utils/orderUtils/getSellAmountWithFee'
 import { ParsedOrder } from 'utils/orderUtils/parseOrder'
 
@@ -84,7 +84,7 @@ export function ReceiptModal({
   const safeTxParams = twapOrder?.safeTxParams
 
   return (
-    <GpModal onDismiss={onDismiss} isOpen={isOpen}>
+    <CowModal onDismiss={onDismiss} isOpen={isOpen}>
       <styledEl.Wrapper>
         <styledEl.Header>
           <styledEl.Title>Order Receipt</styledEl.Title>
@@ -194,6 +194,6 @@ export function ReceiptModal({
           </styledEl.FieldsWrapper>
         </styledEl.Body>
       </styledEl.Wrapper>
-    </GpModal>
+    </CowModal>
   )
 }
diff --git a/src/modules/swap/containers/EthFlow/index.tsx b/src/modules/swap/containers/EthFlow/index.tsx
index aea3d97aaa..fa131d6c2b 100644
--- a/src/modules/swap/containers/EthFlow/index.tsx
+++ b/src/modules/swap/containers/EthFlow/index.tsx
@@ -17,7 +17,7 @@ import { useWrappedToken } from 'modules/trade/hooks/useWrappedToken'
 import { useWalletInfo } from 'modules/wallet'
 
 import { useTradeApproveCallback, useTradeApproveState } from 'common/containers/TradeApprove'
-import { GpModal } from 'common/pure/Modal'
+import { CowModal } from 'common/pure/Modal'
 import useNativeCurrency from 'lib/hooks/useNativeCurrency'
 
 import { useEthFlowActions } from './hooks/useEthFlowActions'
@@ -102,8 +102,8 @@ function EthFlow({
 
 export function EthFlowModal(props: EthFlowProps) {
   return (
-    <GpModal isOpen onDismiss={props.onDismiss}>
+    <CowModal isOpen onDismiss={props.onDismiss}>
       <EthFlow {...props} />
-    </GpModal>
+    </CowModal>
   )
 }
diff --git a/src/modules/swap/containers/SurplusModalSetup/index.tsx b/src/modules/swap/containers/SurplusModalSetup/index.tsx
new file mode 100644
index 0000000000..c519eed4a4
--- /dev/null
+++ b/src/modules/swap/containers/SurplusModalSetup/index.tsx
@@ -0,0 +1,38 @@
+import { useCallback } from 'react'
+
+import { useOrder } from 'legacy/state/orders/hooks'
+
+import { useWalletInfo } from 'modules/wallet'
+
+import { CowModal } from 'common/pure/Modal'
+import * as styledEl from 'common/pure/TransactionSubmittedContent/styled'
+import { SurplusModal } from 'common/pure/TransactionSubmittedContent/SurplusModal'
+
+import { useOrderIdForSurplusModal, useRemoveOrderFromSurplusQueue } from '../../state/surplusModal'
+
+export function SurplusModalSetup() {
+  const orderId = useOrderIdForSurplusModal()
+  const removeOrderId = useRemoveOrderFromSurplusQueue()
+
+  const { chainId } = useWalletInfo()
+  const order = useOrder({ id: orderId, chainId })
+
+  const onDismiss = useCallback(() => {
+    orderId && removeOrderId(orderId)
+  }, [orderId, removeOrderId])
+
+  const isOpen = !!orderId
+
+  return (
+    <CowModal isOpen={isOpen} onDismiss={onDismiss} maxHeight={90} maxWidth={470}>
+      <styledEl.Wrapper>
+        <styledEl.Section>
+          <styledEl.Header>
+            <styledEl.CloseIconWrapper onClick={onDismiss} />
+          </styledEl.Header>
+          <SurplusModal order={order} />
+        </styledEl.Section>
+      </styledEl.Wrapper>
+    </CowModal>
+  )
+}
diff --git a/src/modules/swap/containers/SwapModals/index.tsx b/src/modules/swap/containers/SwapModals/index.tsx
index 63324fa882..bfb450a0b3 100644
--- a/src/modules/swap/containers/SwapModals/index.tsx
+++ b/src/modules/swap/containers/SwapModals/index.tsx
@@ -5,6 +5,8 @@ import { EthFlowModal, EthFlowProps } from 'modules/swap/containers/EthFlow'
 
 import { genericPropsChecker } from 'utils/genericPropsChecker'
 
+import { SurplusModalSetup } from '../SurplusModalSetup'
+
 export interface SwapModalsProps {
   showNativeWrapModal: boolean
   showCowSubsidyModal: boolean
@@ -23,6 +25,7 @@ export const SwapModals = React.memo(function (props: SwapModalsProps) {
       {/*<CowSubsidyModal isOpen={showCowSubsidyModal} onDismiss={closeModals} /> */}
       {<ConfirmSwapModalSetup {...confirmSwapProps} />}
       {showNativeWrapModal && <EthFlowModal {...ethFlowProps} />}
+      {!showNativeWrapModal && <SurplusModalSetup />}
     </>
   )
 }, genericPropsChecker)
diff --git a/src/modules/swap/pure/EthFlow/EthFlowModalContent/index.cosmos.tsx b/src/modules/swap/pure/EthFlow/EthFlowModalContent/index.cosmos.tsx
index c9486f2f65..ecbdc5d58e 100644
--- a/src/modules/swap/pure/EthFlow/EthFlowModalContent/index.cosmos.tsx
+++ b/src/modules/swap/pure/EthFlow/EthFlowModalContent/index.cosmos.tsx
@@ -19,7 +19,7 @@ import {
 import { EthFlowState } from 'modules/swap/services/ethFlow/types'
 import { EthFlowActionContext } from 'modules/swap/state/EthFlow/ethFlowContextAtom'
 
-import { GpModal } from 'common/pure/Modal'
+import { CowModal } from 'common/pure/Modal'
 
 const ALL_STATES = Object.values(EthFlowState)
 
@@ -110,11 +110,11 @@ function Custom() {
   return (
     <>
       {opened ? (
-        <GpModal isOpen onDismiss={onDismiss}>
+        <CowModal isOpen onDismiss={onDismiss}>
           <Wrapper>
             <EthFlowModalContent {...modalProps} />
           </Wrapper>
-        </GpModal>
+        </CowModal>
       ) : (
         <button onClick={openModal}>Open ETH Flow</button>
       )}
diff --git a/src/modules/swap/state/surplusModal.ts b/src/modules/swap/state/surplusModal.ts
new file mode 100644
index 0000000000..bc1f9babd2
--- /dev/null
+++ b/src/modules/swap/state/surplusModal.ts
@@ -0,0 +1,81 @@
+import { atom, useAtomValue } from 'jotai'
+import { useUpdateAtom } from 'jotai/utils'
+
+export type OrdersToDisplayModal = {
+  orderIds: string[]
+  isConfirmationModalOpen: boolean
+}
+
+const initialState: OrdersToDisplayModal = {
+  orderIds: [],
+  isConfirmationModalOpen: false,
+}
+
+const surplusModalAtom = atom<OrdersToDisplayModal>(initialState)
+
+export const addSurplusOrderAtom = atom(null, (get, set, orderId: string) =>
+  set(surplusModalAtom, () => {
+    const state = get(surplusModalAtom)
+
+    // If the confirmation modal is open, we don't want to add the order to the queue
+    if (state.isConfirmationModalOpen) {
+      return state
+    }
+
+    state.orderIds.push(orderId)
+
+    return { ...state }
+  })
+)
+
+export const removeSurplusOrderAtom = atom(null, (get, set, orderId: string) =>
+  set(surplusModalAtom, () => {
+    const state = get(surplusModalAtom)
+
+    state.orderIds = state.orderIds.filter((id) => id !== orderId)
+
+    return { ...state }
+  })
+)
+
+export const setIsConfirmationModalOpenAtom = atom(null, (get, set, isOpen: boolean) =>
+  set(surplusModalAtom, () => {
+    const state = get(surplusModalAtom)
+
+    if (state.isConfirmationModalOpen === isOpen) {
+      // Nothing changed, avoid re-rendering
+      return state
+    }
+
+    return {
+      ...state,
+      isConfirmationModalOpen: isOpen,
+    }
+  })
+)
+
+export const orderIdForSurplusModalAtom = atom<string | undefined>((get) => {
+  const state = get(surplusModalAtom)
+
+  if (state.orderIds.length === 0 || state.isConfirmationModalOpen) {
+    return undefined
+  }
+
+  return state.orderIds[0]
+})
+
+export function useSetIsConfirmationModalOpen() {
+  return useUpdateAtom(setIsConfirmationModalOpenAtom)
+}
+
+export function useAddOrderToSurplusQueue() {
+  return useUpdateAtom(addSurplusOrderAtom)
+}
+
+export function useOrderIdForSurplusModal() {
+  return useAtomValue(orderIdForSurplusModalAtom)
+}
+
+export function useRemoveOrderFromSurplusQueue() {
+  return useUpdateAtom(removeSurplusOrderAtom)
+}
diff --git a/src/modules/trade/containers/TradeConfirmModal/index.tsx b/src/modules/trade/containers/TradeConfirmModal/index.tsx
index bdf2de4cfb..7c796b2ded 100644
--- a/src/modules/trade/containers/TradeConfirmModal/index.tsx
+++ b/src/modules/trade/containers/TradeConfirmModal/index.tsx
@@ -5,7 +5,7 @@ import { isSupportedChain } from 'legacy/utils/supportedChainId'
 
 import { useWalletInfo } from 'modules/wallet'
 
-import { GpModal } from 'common/pure/Modal'
+import { CowModal } from 'common/pure/Modal'
 import { OrderSubmittedContent } from 'common/pure/OrderSubmittedContent'
 import { TransactionErrorContent } from 'common/pure/TransactionErrorContent'
 
@@ -28,7 +28,7 @@ export function TradeConfirmModal(props: TradeConfirmModalProps) {
   if (!isSupportedChain(chainId)) return null
 
   return (
-    <GpModal isOpen={isOpen} onDismiss={onDismiss}>
+    <CowModal isOpen={isOpen} onDismiss={onDismiss}>
       {(() => {
         if (error) {
           return <TransactionErrorContent message={error} onDismiss={onDismiss} />
@@ -45,6 +45,6 @@ export function TradeConfirmModal(props: TradeConfirmModalProps) {
 
         return children
       })()}
-    </GpModal>
+    </CowModal>
   )
 }
diff --git a/src/modules/trade/containers/WrapNativeModal/index.tsx b/src/modules/trade/containers/WrapNativeModal/index.tsx
index 8ae0d04fed..402668a682 100644
--- a/src/modules/trade/containers/WrapNativeModal/index.tsx
+++ b/src/modules/trade/containers/WrapNativeModal/index.tsx
@@ -5,7 +5,7 @@ import { useWalletDisplayedAddress } from 'modules/wallet'
 
 import { useWalletStatusIcon } from 'common/hooks/useWalletStatusIcon'
 import { ConfirmationPendingContent } from 'common/pure/ConfirmationPendingContent'
-import { GpModal } from 'common/pure/Modal'
+import { CowModal } from 'common/pure/Modal'
 import { TokenAmount } from 'common/pure/TokenAmount'
 import { TokenSymbol } from 'common/pure/TokenSymbol'
 
@@ -49,7 +49,7 @@ export function WrapNativeModal() {
   const operationLabel = isNativeIn ? 'wrapping' : 'unwrapping'
 
   return (
-    <GpModal isOpen={isOpen} onDismiss={handleDismiss}>
+    <CowModal isOpen={isOpen} onDismiss={handleDismiss}>
       <ConfirmationPendingContent
         onDismiss={handleDismiss}
         statusIcon={statusIcon}
@@ -59,6 +59,6 @@ export function WrapNativeModal() {
         walletAddress={walletAddress}
         operationLabel={operationLabel}
       />
-    </GpModal>
+    </CowModal>
   )
 }
diff --git a/src/modules/twap/pure/CustomDeadlineSelector/index.tsx b/src/modules/twap/pure/CustomDeadlineSelector/index.tsx
index a617c700b2..c9b53f3dcf 100644
--- a/src/modules/twap/pure/CustomDeadlineSelector/index.tsx
+++ b/src/modules/twap/pure/CustomDeadlineSelector/index.tsx
@@ -5,7 +5,7 @@ import ms from 'ms'
 
 import { ButtonPrimary } from 'legacy/components/Button'
 
-import { GpModal as Modal } from 'common/pure/Modal'
+import { CowModal as Modal } from 'common/pure/Modal'
 
 import * as styledEl from './styled'
 
diff --git a/src/modules/wallet/api/pure/WalletModal/index.tsx b/src/modules/wallet/api/pure/WalletModal/index.tsx
index 53eea0b612..dc1cb9abac 100644
--- a/src/modules/wallet/api/pure/WalletModal/index.tsx
+++ b/src/modules/wallet/api/pure/WalletModal/index.tsx
@@ -12,7 +12,7 @@ import { PendingView } from 'modules/wallet/api/pure/PendingView'
 import { ConnectWalletOptions, TryActivation } from 'modules/wallet/web3-react/connection'
 
 import { Routes } from 'common/constants/routes'
-import { CloseIcon, ContentWrapper, GpModal, HeaderRow, HoverText } from 'common/pure/Modal'
+import { CloseIcon, ContentWrapper, CowModal, HeaderRow, HoverText } from 'common/pure/Modal'
 
 import { CloseColor, OptionGrid, TermsWrapper, UpperSection, Wrapper } from './styled'
 
@@ -50,7 +50,7 @@ export function WalletModal(props: WalletModalProps) {
   // const showZengoBanner = !account && !window.ethereum && isOptions
 
   return (
-    <GpModal maxWidth={600} isOpen={isOpen} onDismiss={toggleModal} minHeight={false} maxHeight={90}>
+    <CowModal maxWidth={600} isOpen={isOpen} onDismiss={toggleModal} minHeight={false} maxHeight={90}>
       <Wrapper>
         <UpperSection>
           <CloseIcon onClick={toggleModal}>
@@ -87,7 +87,7 @@ export function WalletModal(props: WalletModalProps) {
           </ContentWrapper>
         </UpperSection>
       </Wrapper>
-    </GpModal>
+    </CowModal>
   )
 }
 

From a6455fd0fa33a48178314bdf9b760f5dd2796e99 Mon Sep 17 00:00:00 2001
From: Leandro <alfetopito@users.noreply.github.com>
Date: Wed, 5 Jul 2023 01:52:36 -0700
Subject: [PATCH 55/67] feat(hackathon-surplus): refresh surplus on swap trade
 (#2781)

* chore: move total surplus fetching to updater and store it on jotai state

To avoid re-fetching every time the account activity modal is open

* chore: trigger total surplus update when an order is fulfilled

* refactor: split single state file into one per category

A bit overkill but it looks cleaner

* chore: do update inside useEffect

* Fix code style issues with Prettier

---------

Co-authored-by: Lint Action <lint-action@samuelmeuli.com>
---
 src/api/gnosisProtocol/hooks.ts               | 36 +-------------
 src/common/state/totalSurplusState/atoms.ts   | 12 +++++
 src/common/state/totalSurplusState/hooks.ts   | 12 +++++
 src/common/state/totalSurplusState/index.ts   |  2 +
 src/common/state/totalSurplusState/types.ts   | 10 ++++
 .../state/totalSurplusState/updaters.ts       | 49 +++++++++++++++++++
 .../orders/updaters/PendingOrdersUpdater.ts   |  8 +++
 .../containers/AccountDetails/SurplusCard.tsx |  4 +-
 .../application/containers/App/Updaters.tsx   | 10 ++--
 9 files changed, 102 insertions(+), 41 deletions(-)
 create mode 100644 src/common/state/totalSurplusState/atoms.ts
 create mode 100644 src/common/state/totalSurplusState/hooks.ts
 create mode 100644 src/common/state/totalSurplusState/index.ts
 create mode 100644 src/common/state/totalSurplusState/types.ts
 create mode 100644 src/common/state/totalSurplusState/updaters.ts

diff --git a/src/api/gnosisProtocol/hooks.ts b/src/api/gnosisProtocol/hooks.ts
index 43d2c4ff14..7022897384 100644
--- a/src/api/gnosisProtocol/hooks.ts
+++ b/src/api/gnosisProtocol/hooks.ts
@@ -2,10 +2,8 @@ import { useAtomValue } from 'jotai'
 import { useMemo } from 'react'
 
 import { EnrichedOrder } from '@cowprotocol/cow-sdk'
-import { Currency, CurrencyAmount } from '@uniswap/sdk-core'
 
 import useSWR from 'swr'
-import { Nullish } from 'types'
 
 import { AMOUNT_OF_ORDERS_TO_FETCH } from 'legacy/constants'
 import { isBarnBackendEnv } from 'legacy/utils/environments'
@@ -17,9 +15,8 @@ import { TwapPartOrderItem, twapPartOrdersListAtom } from 'modules/twap/state/tw
 import { useWalletInfo } from 'modules/wallet'
 
 import { OrderWithComposableCowInfo } from 'common/types'
-import useNativeCurrency from 'lib/hooks/useNativeCurrency'
 
-import { getOrders, getSurplusData } from './api'
+import { getOrders } from './api'
 
 /**
  * TODO: refactor this hook
@@ -114,34 +111,3 @@ function useTwapChildOrders(prodOrders: EnrichedOrder[] | undefined): OrderWithC
     return orderWithComposableCowInfo
   }, [twapParticleOrders, prodOrders])
 }
-
-export type UseSurplusAmountResult = {
-  surplusAmount: Nullish<CurrencyAmount<Currency>>
-  isLoading: boolean
-  error: string
-}
-
-export function useSurplusAmount(): UseSurplusAmountResult {
-  const { chainId, account } = useWalletInfo()
-  const nativeCurrency = useNativeCurrency()
-
-  const {
-    data: surplusAmount,
-    isLoading,
-    error,
-  } = useSWR<CurrencyAmount<Currency> | null>(['totalSurplus', chainId, account], async () => {
-    if (!chainId || !account) {
-      return null
-    }
-
-    const surplusData = await getSurplusData(chainId, account)
-
-    if (!surplusData?.totalSurplus) {
-      return null
-    }
-
-    return CurrencyAmount.fromRawAmount(nativeCurrency, surplusData.totalSurplus)
-  })
-
-  return { surplusAmount, isLoading, error }
-}
diff --git a/src/common/state/totalSurplusState/atoms.ts b/src/common/state/totalSurplusState/atoms.ts
new file mode 100644
index 0000000000..f842b0259f
--- /dev/null
+++ b/src/common/state/totalSurplusState/atoms.ts
@@ -0,0 +1,12 @@
+import { atom } from 'jotai'
+
+import { TotalSurplusState } from './types'
+
+export const totalSurplusAtom = atom<TotalSurplusState>({
+  surplusAmount: null,
+  isLoading: false,
+  error: '',
+  refetch: null,
+})
+
+export const totalSurplusRefetchAtom = atom((get) => get(totalSurplusAtom).refetch)
diff --git a/src/common/state/totalSurplusState/hooks.ts b/src/common/state/totalSurplusState/hooks.ts
new file mode 100644
index 0000000000..2d31ba36fc
--- /dev/null
+++ b/src/common/state/totalSurplusState/hooks.ts
@@ -0,0 +1,12 @@
+import { useAtomValue } from 'jotai'
+
+import { totalSurplusAtom, totalSurplusRefetchAtom } from './atoms'
+import { TotalSurplusState } from './types'
+
+export function useTotalSurplus(): TotalSurplusState {
+  return useAtomValue(totalSurplusAtom)
+}
+
+export function useTriggerTotalSurplusUpdateCallback(): (() => void) | null {
+  return useAtomValue(totalSurplusRefetchAtom)
+}
diff --git a/src/common/state/totalSurplusState/index.ts b/src/common/state/totalSurplusState/index.ts
new file mode 100644
index 0000000000..6bab92321a
--- /dev/null
+++ b/src/common/state/totalSurplusState/index.ts
@@ -0,0 +1,2 @@
+export { TotalSurplusUpdater } from './updaters'
+export { useTriggerTotalSurplusUpdateCallback, useTotalSurplus } from './hooks'
diff --git a/src/common/state/totalSurplusState/types.ts b/src/common/state/totalSurplusState/types.ts
new file mode 100644
index 0000000000..9bf58d4f19
--- /dev/null
+++ b/src/common/state/totalSurplusState/types.ts
@@ -0,0 +1,10 @@
+import { Currency, CurrencyAmount } from '@uniswap/sdk-core'
+
+import { Nullish } from 'types'
+
+export type TotalSurplusState = {
+  surplusAmount: Nullish<CurrencyAmount<Currency>>
+  isLoading: boolean
+  error: string
+  refetch: (() => void) | null
+}
diff --git a/src/common/state/totalSurplusState/updaters.ts b/src/common/state/totalSurplusState/updaters.ts
new file mode 100644
index 0000000000..0cf185af88
--- /dev/null
+++ b/src/common/state/totalSurplusState/updaters.ts
@@ -0,0 +1,49 @@
+import { useUpdateAtom } from 'jotai/utils'
+import { useCallback, useEffect } from 'react'
+
+import { Currency, CurrencyAmount } from '@uniswap/sdk-core'
+
+import useSWR from 'swr'
+
+import { useWalletInfo } from 'modules/wallet'
+
+import { getSurplusData } from 'api/gnosisProtocol/api'
+import useNativeCurrency from 'lib/hooks/useNativeCurrency'
+
+import { totalSurplusAtom } from './atoms'
+
+export function TotalSurplusUpdater(): null {
+  const { chainId, account } = useWalletInfo()
+  const nativeCurrency = useNativeCurrency()
+  const setTotalSurplus = useUpdateAtom(totalSurplusAtom)
+
+  const fetcher = useCallback(
+    async ([, chainId, account]: [string, number, string]) => {
+      const surplusData = await getSurplusData(chainId, account)
+
+      if (!surplusData?.totalSurplus) {
+        return null
+      }
+
+      return CurrencyAmount.fromRawAmount(nativeCurrency, surplusData.totalSurplus)
+    },
+    [nativeCurrency]
+  )
+
+  const {
+    data: surplusAmount,
+    isLoading,
+    error,
+    mutate: refetch,
+  } = useSWR<CurrencyAmount<Currency> | null>(
+    // Don't load if required params are missing: https://swr.vercel.app/docs/conditional-fetching
+    chainId && account ? ['getSurplusData', chainId, account] : null,
+    fetcher
+  )
+
+  useEffect(() => {
+    setTotalSurplus({ surplusAmount, isLoading, error, refetch })
+  }, [error, isLoading, refetch, setTotalSurplus, surplusAmount])
+
+  return null
+}
diff --git a/src/legacy/state/orders/updaters/PendingOrdersUpdater.ts b/src/legacy/state/orders/updaters/PendingOrdersUpdater.ts
index 62fbd0db19..a04c166abb 100644
--- a/src/legacy/state/orders/updaters/PendingOrdersUpdater.ts
+++ b/src/legacy/state/orders/updaters/PendingOrdersUpdater.ts
@@ -32,6 +32,7 @@ import { useWalletInfo } from 'modules/wallet'
 
 import { getOrder, OrderID } from 'api/gnosisProtocol'
 import { removeOrdersToCancelAtom } from 'common/hooks/useMultipleOrdersCancellation/state'
+import { useTriggerTotalSurplusUpdateCallback } from 'common/state/totalSurplusState'
 import { timeSinceInSeconds } from 'utils/time'
 
 /**
@@ -143,6 +144,7 @@ interface UpdateOrdersParams {
   cancelOrdersBatch: CancelOrdersBatchCallback
   presignOrders: PresignOrdersCallback
   addOrderToSurplusQueue: (orderId: string) => void
+  triggerTotalSurplusUpdate: (() => void) | null
   updatePresignGnosisSafeTx: UpdatePresignGnosisSafeTxCallback
   getSafeInfo: GetSafeInfo
 }
@@ -158,6 +160,7 @@ async function _updateOrders({
   cancelOrdersBatch,
   presignOrders,
   addOrderToSurplusQueue,
+  triggerTotalSurplusUpdate,
   updatePresignGnosisSafeTx,
   getSafeInfo,
 }: UpdateOrdersParams): Promise<void> {
@@ -231,6 +234,8 @@ async function _updateOrders({
         addOrderToSurplusQueue(id)
       }
     })
+    // trigger total surplus update
+    triggerTotalSurplusUpdate?.()
   }
 
   // Update the presign Gnosis Safe Tx info (if applies)
@@ -278,6 +283,7 @@ export function PendingOrdersUpdater(): null {
   const addOrUpdateOrders = useAddOrUpdateOrders()
   const presignOrders = usePresignOrders()
   const addOrderToSurplusQueue = useAddOrderToSurplusQueue()
+  const triggerTotalSurplusUpdate = useTriggerTotalSurplusUpdateCallback()
   const updatePresignGnosisSafeTx = useUpdatePresignGnosisSafeTx()
   const getSafeInfo = useGetSafeInfo()
 
@@ -310,6 +316,7 @@ export function PendingOrdersUpdater(): null {
           cancelOrdersBatch,
           presignOrders,
           addOrderToSurplusQueue,
+          triggerTotalSurplusUpdate,
           updatePresignGnosisSafeTx,
           getSafeInfo,
         }).finally(() => {
@@ -325,6 +332,7 @@ export function PendingOrdersUpdater(): null {
       cancelOrdersBatch,
       presignOrders,
       addOrderToSurplusQueue,
+      triggerTotalSurplusUpdate,
       updatePresignGnosisSafeTx,
       getSafeInfo,
     ]
diff --git a/src/modules/account/containers/AccountDetails/SurplusCard.tsx b/src/modules/account/containers/AccountDetails/SurplusCard.tsx
index fcd01cddca..1d32207c11 100644
--- a/src/modules/account/containers/AccountDetails/SurplusCard.tsx
+++ b/src/modules/account/containers/AccountDetails/SurplusCard.tsx
@@ -5,15 +5,15 @@ import { supportedChainId } from 'legacy/utils/supportedChainId'
 
 import { useWalletInfo } from 'modules/wallet'
 
-import { useSurplusAmount } from 'api/gnosisProtocol/hooks'
 import { FiatAmount } from 'common/pure/FiatAmount'
 import { HelpCircle } from 'common/pure/HelpCircle'
 import { TokenAmount } from 'common/pure/TokenAmount'
+import { useTotalSurplus } from 'common/state/totalSurplusState'
 
 import { InfoCard } from './styled'
 
 export function SurplusCard() {
-  const { surplusAmount, isLoading } = useSurplusAmount()
+  const { surplusAmount, isLoading } = useTotalSurplus()
 
   const surplusUsdAmount = useHigherUSDValue(surplusAmount)
 
diff --git a/src/modules/application/containers/App/Updaters.tsx b/src/modules/application/containers/App/Updaters.tsx
index e7552ff273..fa17c7eed5 100644
--- a/src/modules/application/containers/App/Updaters.tsx
+++ b/src/modules/application/containers/App/Updaters.tsx
@@ -5,23 +5,24 @@ import GasUpdater from 'legacy/state/gas/updater'
 import ListsUpdater from 'legacy/state/lists/updater'
 import LogsUpdater from 'legacy/state/logs/updater'
 import {
-  GpOrdersUpdater,
   CancelledOrdersUpdater,
+  ExpiredOrdersUpdater,
+  GpOrdersUpdater,
   PendingOrdersUpdater,
   UnfillableOrdersUpdater,
-  ExpiredOrdersUpdater,
 } from 'legacy/state/orders/updaters'
 import { SpotPricesUpdater } from 'legacy/state/orders/updaters/SpotPricesUpdater'
 import FeesUpdater from 'legacy/state/price/updater'
 import SentryUpdater from 'legacy/state/sentry/updater'
 import UserUpdater from 'legacy/state/user/updater'
 
-import { UploadToIpfsUpdater, AppDataUpdater } from 'modules/appData'
+import { AppDataUpdater, UploadToIpfsUpdater } from 'modules/appData'
 import { InjectedWidgetUpdater } from 'modules/injectedWidget'
-import { EthFlowSlippageUpdater, EthFlowDeadlineUpdater } from 'modules/swap/state/EthFlow/updaters'
+import { EthFlowDeadlineUpdater, EthFlowSlippageUpdater } from 'modules/swap/state/EthFlow/updaters'
 import { TokensListUpdater } from 'modules/tokensList/updaters/TokensListUpdater'
 import { WalletUpdater } from 'modules/wallet'
 
+import { TotalSurplusUpdater } from 'common/state/totalSurplusState'
 import { ThemeFromUrlUpdater } from 'common/updaters/ThemeFromUrlUpdater'
 import { MulticallUpdater } from 'lib/state/multicall'
 
@@ -52,6 +53,7 @@ export function Updaters() {
       <SpotPricesUpdater />
       <ThemeFromUrlUpdater />
       <InjectedWidgetUpdater />
+      <TotalSurplusUpdater />
     </>
   )
 }

From 353bcdbd95c56fe9d2d9baf7a9df9a5bd08bc493 Mon Sep 17 00:00:00 2001
From: Alexandr Kazachenko <shoom3301@gmail.com>
Date: Wed, 5 Jul 2023 16:08:16 +0600
Subject: [PATCH 56/67] fix(trade): switch tokens places event when one is
 empty (#2786)

---
 src/modules/trade/hooks/useSwitchTokensPlaces.ts | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/modules/trade/hooks/useSwitchTokensPlaces.ts b/src/modules/trade/hooks/useSwitchTokensPlaces.ts
index 0e8fc09352..a303893490 100644
--- a/src/modules/trade/hooks/useSwitchTokensPlaces.ts
+++ b/src/modules/trade/hooks/useSwitchTokensPlaces.ts
@@ -13,6 +13,8 @@ import { useTradeState } from './useTradeState'
 
 import { ExtendedTradeRawState } from '../types/TradeRawState'
 
+const EMPTY_CURRENCY_ID = '_'
+
 // TODO: when implementing this for SWAP remmeber this logic related to ETH flow
 // https://github.com/cowprotocol/cowswap/blob/628c62596d65e0761ccf70677a55bec9a0a36411/src/legacy/state/swap/reducer.ts#L143
 export function useSwitchTokensPlaces(stateOverride: Partial<ExtendedTradeRawState> = {}) {
@@ -26,7 +28,7 @@ export function useSwitchTokensPlaces(stateOverride: Partial<ExtendedTradeRawSta
   const updateState = tradeState?.updateState
 
   return useCallback(() => {
-    if (!inputCurrencyId || !outputCurrencyId || !updateState) return
+    if (!updateState) return
 
     if (!isWrapOrUnwrap) {
       switchTokensAnalytics()
@@ -39,7 +41,10 @@ export function useSwitchTokensPlaces(stateOverride: Partial<ExtendedTradeRawSta
       })
     }
 
-    tradeNavigate(chainId, { inputCurrencyId: outputCurrencyId, outputCurrencyId: inputCurrencyId })
+    tradeNavigate(chainId, {
+      inputCurrencyId: outputCurrencyId || EMPTY_CURRENCY_ID,
+      outputCurrencyId: inputCurrencyId || EMPTY_CURRENCY_ID,
+    })
   }, [
     updateState,
     isWrapOrUnwrap,

From ccaea41e581f63d13e8afdbe7b5bfe665741d37f Mon Sep 17 00:00:00 2001
From: Alexandr Kazachenko <shoom3301@gmail.com>
Date: Wed, 5 Jul 2023 16:58:29 +0600
Subject: [PATCH 57/67] fix(trade): display unsupported token banner (#2789)

---
 .../pure/TradeFormButtons/tradeButtonsMap.tsx | 42 +++++++++++--------
 1 file changed, 25 insertions(+), 17 deletions(-)

diff --git a/src/modules/tradeFormValidation/pure/TradeFormButtons/tradeButtonsMap.tsx b/src/modules/tradeFormValidation/pure/TradeFormButtons/tradeButtonsMap.tsx
index ab4e433eed..1dac259d80 100644
--- a/src/modules/tradeFormValidation/pure/TradeFormButtons/tradeButtonsMap.tsx
+++ b/src/modules/tradeFormValidation/pure/TradeFormButtons/tradeButtonsMap.tsx
@@ -36,6 +36,26 @@ const quoteErrorTexts: Record<GpQuoteErrorCodes, string> = {
   [GpQuoteErrorCodes.ZeroPrice]: 'Invalid price. Try increasing input/output amount.',
 }
 
+const unsupportedTokenButton = (context: TradeFormButtonContext) => {
+  const { derivedState, isSupportedWallet } = context
+  const { inputCurrency, outputCurrency } = derivedState
+
+  return inputCurrency && outputCurrency ? (
+    <>
+      <TradeFormBlankButton disabled={true}>
+        <Trans>Unsupported token</Trans>
+      </TradeFormBlankButton>
+      <CompatibilityIssuesWarningWrapper>
+        <CompatibilityIssuesWarning
+          currencyIn={inputCurrency}
+          currencyOut={outputCurrency}
+          isSupportedWallet={isSupportedWallet}
+        />
+      </CompatibilityIssuesWarningWrapper>
+    </>
+  ) : null
+}
+
 export const tradeButtonsMap: Record<TradeFormValidation, ButtonErrorConfig | ButtonCallback> = {
   [TradeFormValidation.WrapUnwrapAmountNotSet]: {
     text: 'Enter an amount',
@@ -59,28 +79,16 @@ export const tradeButtonsMap: Record<TradeFormValidation, ButtonErrorConfig | Bu
     text: 'Enter a valid recipient',
   },
   [TradeFormValidation.CurrencyNotSupported]: (context) => {
-    const { derivedState, isSupportedWallet } = context
-    const { inputCurrency, outputCurrency } = derivedState
-
-    return inputCurrency && outputCurrency ? (
-      <>
-        <TradeFormBlankButton disabled={true}>
-          <Trans>Unsupported token</Trans>
-        </TradeFormBlankButton>
-        <CompatibilityIssuesWarningWrapper>
-          <CompatibilityIssuesWarning
-            currencyIn={inputCurrency}
-            currencyOut={outputCurrency}
-            isSupportedWallet={isSupportedWallet}
-          />
-        </CompatibilityIssuesWarningWrapper>
-      </>
-    ) : null
+    return unsupportedTokenButton(context)
   },
   [TradeFormValidation.QuoteErrors]: (context) => {
     const { quote } = context
     const defaultError = quoteErrorTexts[GpQuoteErrorCodes.UNHANDLED_ERROR]
 
+    if (quote.error?.type === GpQuoteErrorCodes.UnsupportedToken) {
+      return unsupportedTokenButton(context)
+    }
+
     return (
       <TradeFormBlankButton disabled={true}>
         <Trans>{(quote.error && quoteErrorTexts[quote.error.type]) || defaultError}</Trans>

From 0446ed2e3f634db48f703495e771ee03240756bb Mon Sep 17 00:00:00 2001
From: fairlight <31534717+fairlighteth@users.noreply.github.com>
Date: Wed, 5 Jul 2023 13:33:31 +0100
Subject: [PATCH 58/67] feat(trade): redesign trade menu (#2784)

---
 .../containers/TradeWidgetLinks/index.tsx     | 69 ++++++++++---------
 .../containers/TradeWidgetLinks/styled.ts     | 48 ++++++++-----
 .../trade/containers/TradeWidget/styled.tsx   |  8 +--
 .../twap/containers/TwapFormWidget/styled.tsx |  2 +-
 4 files changed, 73 insertions(+), 54 deletions(-)

diff --git a/src/modules/application/containers/TradeWidgetLinks/index.tsx b/src/modules/application/containers/TradeWidgetLinks/index.tsx
index df22701ccc..f986f8159a 100644
--- a/src/modules/application/containers/TradeWidgetLinks/index.tsx
+++ b/src/modules/application/containers/TradeWidgetLinks/index.tsx
@@ -1,49 +1,54 @@
+import React from 'react'
+
 import { Trans } from '@lingui/macro'
+import { matchPath, useLocation } from 'react-router-dom'
 
 import { useTradeRouteContext } from 'modules/trade/hooks/useTradeRouteContext'
 import { parameterizeTradeRoute } from 'modules/trade/utils/parameterizeTradeRoute'
 
-import { Routes } from 'common/constants/routes'
+import { Routes, RoutesValues } from 'common/constants/routes'
 import { FeatureGuard } from 'common/containers/FeatureGuard'
 
 import * as styledEl from './styled'
 
+interface MenuItemConfig {
+  route: RoutesValues
+  label: string
+  featureGuard?: string
+}
+
+const menuItems: MenuItemConfig[] = [
+  { route: Routes.SWAP, label: 'Swap' },
+  { route: Routes.LIMIT_ORDER, label: 'Limit' },
+  { route: Routes.ADVANCED_ORDERS, label: 'Advanced', featureGuard: 'advancedOrdersEnabled' },
+]
+
 export function TradeWidgetLinks() {
   const tradeContext = useTradeRouteContext()
+  const location = useLocation()
 
   return (
     <styledEl.Wrapper>
-      <styledEl.MenuItem>
-        <styledEl.Link
-          className={({ isActive }) => (isActive ? 'active' : undefined)}
-          to={parameterizeTradeRoute(tradeContext, Routes.SWAP)}
-        >
-          <Trans>Swap</Trans>
-        </styledEl.Link>
-      </styledEl.MenuItem>
-
-      <styledEl.MenuItem>
-        <styledEl.Link
-          className={({ isActive }) => (isActive ? 'active' : undefined)}
-          to={parameterizeTradeRoute(tradeContext, Routes.LIMIT_ORDER)}
-        >
-          <Trans>Limit</Trans>
-        </styledEl.Link>
-      </styledEl.MenuItem>
-
-      <FeatureGuard featureFlag="advancedOrdersEnabled">
-        <styledEl.MenuItem>
-          <styledEl.Link
-            className={({ isActive }) => (isActive ? 'active' : undefined)}
-            to={parameterizeTradeRoute(tradeContext, Routes.ADVANCED_ORDERS)}
-          >
-            <Trans>Advanced</Trans>
-            <styledEl.Badge>
-              <Trans>Beta</Trans>
-            </styledEl.Badge>
-          </styledEl.Link>
-        </styledEl.MenuItem>
-      </FeatureGuard>
+      {menuItems.map((item) => {
+        const routePath = parameterizeTradeRoute(tradeContext, item.route)
+        const isActive = !!matchPath(location.pathname, routePath)
+        const menuItem = <MenuItem routePath={routePath} item={item} isActive={isActive} />
+
+        return item.featureGuard ? <FeatureGuard featureFlag={item.featureGuard}>{menuItem}</FeatureGuard> : menuItem
+      })}
     </styledEl.Wrapper>
   )
 }
+
+const MenuItem = ({ routePath, item, isActive }: { routePath: string; item: MenuItemConfig; isActive: boolean }) => (
+  <styledEl.MenuItem isActive={isActive}>
+    <styledEl.Link to={routePath}>
+      <Trans>{item.label}</Trans>
+      {item.featureGuard && (
+        <styledEl.Badge>
+          <Trans>Beta</Trans>
+        </styledEl.Badge>
+      )}
+    </styledEl.Link>
+  </styledEl.MenuItem>
+)
diff --git a/src/modules/application/containers/TradeWidgetLinks/styled.ts b/src/modules/application/containers/TradeWidgetLinks/styled.ts
index dd02600e95..5ddfa9e97c 100644
--- a/src/modules/application/containers/TradeWidgetLinks/styled.ts
+++ b/src/modules/application/containers/TradeWidgetLinks/styled.ts
@@ -1,23 +1,24 @@
 import { transparentize } from 'polished'
 import { NavLink } from 'react-router-dom'
-import styled from 'styled-components/macro'
+import styled, { css } from 'styled-components/macro'
 
 export const Badge = styled.div`
-  background: ${({ theme }) => theme.grey1};
+  background: transparent;
   color: ${({ theme }) => transparentize(0.4, theme.text1)};
-  border: none;
+  border: 0;
   cursor: pointer;
   border-radius: 16px;
-  font-size: 10px;
+  font-size: 9px;
   font-weight: inherit;
   text-transform: uppercase;
-  padding: 4px 6px;
+  padding: 0;
   letter-spacing: 0.2px;
   font-weight: 600;
   transition: color 0.15s ease-in-out;
+  margin: -8px 0 0 0;
 `
 
-export const Link = styled(NavLink)<{ isActive?: boolean }>`
+export const Link = styled(NavLink)`
   display: flex;
   align-items: center;
   text-decoration: none;
@@ -27,31 +28,46 @@ export const Link = styled(NavLink)<{ isActive?: boolean }>`
   line-height: 1;
   transition: color 0.15s ease-in-out;
 
-  &.active {
-    font-weight: 600;
-  }
-
   &:hover,
-  &.active,
-  &.active + div,
-  &:hover > ${Badge}, &.active > ${Badge} {
+  &:hover > ${Badge} {
     color: ${({ theme }) => theme.text1};
   }
 `
 
 export const Wrapper = styled.div`
+  background: transparent;
+  border-radius: 16px;
+  padding: 0;
   display: flex;
   flex-flow: row wrap;
-  gap: 10px;
+  gap: 0;
 
   ${Link} {
     text-decoration: none;
   }
 `
 
-export const MenuItem = styled.div`
+export const MenuItem = styled.div<{ isActive?: boolean }>`
   display: flex;
   align-items: center;
-  font-size: 15px;
+  font-size: 14px;
   font-weight: 500;
+  border-radius: 16px;
+  padding: 5px 10px;
+  background: transparent;
+  transition: background 0.2 ease-in-out;
+
+  ${({ isActive, theme }) =>
+    isActive &&
+    css`
+      background: ${theme.grey1};
+
+      ${Link} {
+        color: ${theme.text1};
+      }
+
+      ${Link} > ${Badge} {
+        margin: 0 0 0 3px;
+      }
+    `}
 `
diff --git a/src/modules/trade/containers/TradeWidget/styled.tsx b/src/modules/trade/containers/TradeWidget/styled.tsx
index 327c7ef738..49c68e8dda 100644
--- a/src/modules/trade/containers/TradeWidget/styled.tsx
+++ b/src/modules/trade/containers/TradeWidget/styled.tsx
@@ -11,22 +11,20 @@ export const Container = styled.div`
 export const ContainerBox = styled.div`
   display: flex;
   flex-flow: column wrap;
-  gap: 8px;
+  gap: 10px;
   background: ${({ theme }) => theme.bg1};
   border: none;
   border-radius: 16px;
   box-shadow: ${({ theme }) => theme.boxShadow1};
-  padding: 8px;
+  padding: 10px;
 `
 
 export const Header = styled.div`
   display: flex;
   justify-content: space-between;
   align-items: center;
-  padding: 4px 4px 4px 8px;
+  padding: 0;
   margin: 0;
-  font-weight: 500;
-  font-size: 16px;
 `
 
 export const CurrencySeparatorBox = styled.div<{ withRecipient: boolean; compactView: boolean }>`
diff --git a/src/modules/twap/containers/TwapFormWidget/styled.tsx b/src/modules/twap/containers/TwapFormWidget/styled.tsx
index 67c521d174..dc7405545a 100644
--- a/src/modules/twap/containers/TwapFormWidget/styled.tsx
+++ b/src/modules/twap/containers/TwapFormWidget/styled.tsx
@@ -6,7 +6,7 @@ import { RateInfo } from 'common/pure/RateInfo'
 
 export const Row = styled.div`
   display: flex;
-  grid-gap: 8px;
+  grid-gap: 10px;
 
   ${({ theme }) => theme.mediaWidth.upToSmall`
     flex-direction: column;

From 78ee76a2b897bdbf70e2244cef1c5368b06a3169 Mon Sep 17 00:00:00 2001
From: fairlight <31534717+fairlighteth@users.noreply.github.com>
Date: Mon, 10 Jul 2023 13:11:26 +0100
Subject: [PATCH 59/67] style(surplus): add surplus account styling 1 -
 Cherry-picked (#2776)

* feat: surplus account styling

* feat: surplus account styling

* feat: surplus account styling mobile

* Fix code style issues with Prettier

* feat: surplus account styling mobile

* Fix code style issues with Prettier

* Update src/modules/account/containers/AccountDetails/SurplusCard.tsx

Co-authored-by: Leandro <alfetopito@users.noreply.github.com>

* Fix code style issues with Prettier

* feat: full width card

---------

Co-authored-by: Lint Action <lint-action@samuelmeuli.com>
Co-authored-by: Leandro <alfetopito@users.noreply.github.com>
---
 src/legacy/theme/baseTheme.tsx                |   4 +
 src/legacy/theme/styled.d.ts                  |   1 +
 .../containers/AccountDetails/SurplusCard.tsx | 163 +++++++++++++++---
 3 files changed, 145 insertions(+), 23 deletions(-)

diff --git a/src/legacy/theme/baseTheme.tsx b/src/legacy/theme/baseTheme.tsx
index fa4f5e75ea..1bd5b83cc2 100644
--- a/src/legacy/theme/baseTheme.tsx
+++ b/src/legacy/theme/baseTheme.tsx
@@ -169,6 +169,10 @@ export function themeVariables(darkMode: boolean, colorsTheme: Colors) {
     boxShadow2: '0 4px 12px 0 rgb(0 0 0 / 15%)',
     boxShadow3: `0 4px 12px 0 ${transparentize(0.9, colorsTheme.text3)}`,
     gradient1: `linear-gradient(145deg, ${colorsTheme.bg1}, ${colorsTheme.grey1})`,
+    gradient2: `linear-gradient(250deg, ${transparentize(0.92, colorsTheme.alert)} 10%, ${transparentize(
+      0.92,
+      colorsTheme.success
+    )} 50%, ${transparentize(0.92, colorsTheme.success)} 100%);`,
     input: {
       bg1: darkMode ? '#07162D' : '#ECF1F8',
     },
diff --git a/src/legacy/theme/styled.d.ts b/src/legacy/theme/styled.d.ts
index daffb8800a..066f7d49c6 100644
--- a/src/legacy/theme/styled.d.ts
+++ b/src/legacy/theme/styled.d.ts
@@ -136,6 +136,7 @@ declare module 'styled-components' {
     boxShadow2: string
     boxShadow3: string
     gradient1: string
+    gradient2: string
     input: {
       bg1: Color
     }
diff --git a/src/modules/account/containers/AccountDetails/SurplusCard.tsx b/src/modules/account/containers/AccountDetails/SurplusCard.tsx
index 1d32207c11..7041fa3fcb 100644
--- a/src/modules/account/containers/AccountDetails/SurplusCard.tsx
+++ b/src/modules/account/containers/AccountDetails/SurplusCard.tsx
@@ -1,4 +1,7 @@
-import { MouseoverTooltipContent } from 'legacy/components/Tooltip'
+import { transparentize } from 'polished'
+import styled from 'styled-components/macro'
+
+import QuestionHelper, { QuestionWrapper } from 'legacy/components/QuestionHelper'
 import { useHigherUSDValue } from 'legacy/hooks/useStablecoinPrice'
 import { ExternalLink } from 'legacy/theme'
 import { supportedChainId } from 'legacy/utils/supportedChainId'
@@ -6,7 +9,6 @@ import { supportedChainId } from 'legacy/utils/supportedChainId'
 import { useWalletInfo } from 'modules/wallet'
 
 import { FiatAmount } from 'common/pure/FiatAmount'
-import { HelpCircle } from 'common/pure/HelpCircle'
 import { TokenAmount } from 'common/pure/TokenAmount'
 import { useTotalSurplus } from 'common/state/totalSurplusState'
 
@@ -17,31 +19,146 @@ export function SurplusCard() {
 
   const surplusUsdAmount = useHigherUSDValue(surplusAmount)
 
+  // TODO: Remove these 2 lines once merged in DEVELOP (this change was cherry-picked from it, and it still needs these two lines because it doesn't have sasha refactor for supportedChainId)
   const { chainId } = useWalletInfo()
-
   if (!supportedChainId(chainId)) return null
+  // ------- end of TODO
+
+  const Wrapper = styled.div`
+    margin: 0 auto 24px;
+    width: 100%;
+    display: grid;
+    align-items: center;
+    justify-content: center;
+    grid-template-columns: 1fr;
+    gap: 24px;
+    box-sizing: border-box;
+    padding: 0 24px;
+
+    ${({ theme }) => theme.mediaWidth.upToSmall`
+      display: flex;
+      flex-flow: column wrap;
+      padding: 0 16px;
+    `}
+
+    ${InfoCard} {
+      display: flex;
+      flex-flow: column wrap;
+      align-items: center;
+      justify-content: center;
+      gap: 0;
+      background: ${({ theme }) => theme.gradient2};
+      border-radius: 16px;
+      padding: 20px 26px 26px;
+      min-height: 210px;
+      width: 100%;
+      max-width: 100%;
+      margin: 0;
+    }
+
+    ${InfoCard} > div {
+      display: flex;
+      flex-flow: column wrap;
+      align-items: center;
+      justify-content: center;
+
+      &:first-child {
+        margin: 20px auto 0;
+      }
+
+      &:last-child {
+        margin: auto 0 0;
+      }
+    }
+
+    ${InfoCard} > div > span {
+      display: flex;
+      flex-flow: column wrap;
+      align-items: center;
+      justify-content: center;
+    }
+
+    ${InfoCard} > div > span > i,
+    ${InfoCard} > div > a,
+    ${InfoCard} > div > span > p {
+      display: flex;
+      font-size: 13px;
+      font-style: normal;
+      font-weight: 500;
+      line-height: 1.1;
+      width: 100%;
+      text-align: center;
+      justify-content: center;
+      align-items: center;
+      color: ${({ theme }) => transparentize(0.3, theme.text1)};
+    }
+
+    ${InfoCard} > div > span > p {
+      color: ${({ theme }) => theme.text1};
+    }
+
+    ${InfoCard} > div > span > b {
+      font-size: 28px;
+      font-weight: bold;
+      color: ${({ theme }) => theme.success};
+      width: 100%;
+      text-align: center;
+      margin: 20px auto 0;
+      word-break: break-all;
+    }
+
+    ${InfoCard} > div > a {
+      margin: 20px auto 0;
+    }
+
+    ${InfoCard} > div > small {
+      font-size: 15px;
+      font-weight: 500;
+      line-height: 1.1;
+      color: ${({ theme }) => transparentize(0.5, theme.text1)};
+      margin: 3px auto 0;
+    }
+
+    ${QuestionWrapper} {
+      opacity: 0.5;
+      transition: opacity 0.2s ease-in-out;
+
+      &:hover {
+        opacity: 1;
+      }
+    }
+  `
 
   return (
-    <InfoCard>
-      <span>
-        Your total surplus{' '}
-        <MouseoverTooltipContent content={'TODO: insert tooltip'} wrap>
-          <HelpCircle size={14} />
-        </MouseoverTooltipContent>
-      </span>
-      <span>
-        {isLoading
-          ? 'Loading...'
-          : surplusAmount && (
-              <>
-                +<TokenAmount amount={surplusAmount} tokenSymbol={surplusAmount?.currency} />
-              </>
+    <Wrapper>
+      <InfoCard>
+        <div>
+          <span>
+            <i>
+              Your total surplus <QuestionHelper text={'TODO: insert tooltip'} />
+            </i>
+          </span>
+          <span>
+            {isLoading ? (
+              <p>Loading...</p>
+            ) : (
+              surplusAmount && (
+                <b>
+                  +<TokenAmount amount={surplusAmount} tokenSymbol={surplusAmount?.currency} />
+                </b>
+              )
             )}
-        {!surplusAmount && 'No surplus for the given time period'}
-      </span>
-      {surplusUsdAmount && <FiatAmount amount={surplusUsdAmount} accurate={false} />}
-      {/* TODO: add correct link */}
-      <ExternalLink href={'https://swap.cow.fi'}>Learn about surplus on CoW Swap ↗</ExternalLink>
-    </InfoCard>
+            {!surplusAmount && <p>No surplus for the given time period</p>}
+          </span>
+          <small>{surplusUsdAmount && <FiatAmount amount={surplusUsdAmount} accurate={false} />}</small>
+        </div>
+        <div>
+          {/* TODO: add correct link */}
+          <ExternalLink href={'https://blog.cow.fi/announcing-cow-swap-surplus-notifications-f679c77702ea'}>
+            Learn about surplus on CoW Swap ↗
+          </ExternalLink>
+        </div>
+      </InfoCard>
+    </Wrapper>
   )
 }

From 4164b0cd31096744a5edab7c3ce188437a6dc4b9 Mon Sep 17 00:00:00 2001
From: Anxo Rodriguez <anxolin@gmail.com>
Date: Mon, 10 Jul 2023 13:57:45 +0100
Subject: [PATCH 60/67] chore(surplus): move styles from surplus to styled
 (#2826)

---
 .../containers/AccountDetails/SurplusCard.tsx | 116 +-----------------
 .../containers/AccountDetails/styled.ts       | 107 ++++++++++++++++
 2 files changed, 111 insertions(+), 112 deletions(-)

diff --git a/src/modules/account/containers/AccountDetails/SurplusCard.tsx b/src/modules/account/containers/AccountDetails/SurplusCard.tsx
index 7041fa3fcb..c975815c90 100644
--- a/src/modules/account/containers/AccountDetails/SurplusCard.tsx
+++ b/src/modules/account/containers/AccountDetails/SurplusCard.tsx
@@ -1,7 +1,4 @@
-import { transparentize } from 'polished'
-import styled from 'styled-components/macro'
-
-import QuestionHelper, { QuestionWrapper } from 'legacy/components/QuestionHelper'
+import QuestionHelper from 'legacy/components/QuestionHelper'
 import { useHigherUSDValue } from 'legacy/hooks/useStablecoinPrice'
 import { ExternalLink } from 'legacy/theme'
 import { supportedChainId } from 'legacy/utils/supportedChainId'
@@ -12,7 +9,7 @@ import { FiatAmount } from 'common/pure/FiatAmount'
 import { TokenAmount } from 'common/pure/TokenAmount'
 import { useTotalSurplus } from 'common/state/totalSurplusState'
 
-import { InfoCard } from './styled'
+import { InfoCard, SurplusCardWrapper } from './styled'
 
 export function SurplusCard() {
   const { surplusAmount, isLoading } = useTotalSurplus()
@@ -24,113 +21,8 @@ export function SurplusCard() {
   if (!supportedChainId(chainId)) return null
   // ------- end of TODO
 
-  const Wrapper = styled.div`
-    margin: 0 auto 24px;
-    width: 100%;
-    display: grid;
-    align-items: center;
-    justify-content: center;
-    grid-template-columns: 1fr;
-    gap: 24px;
-    box-sizing: border-box;
-    padding: 0 24px;
-
-    ${({ theme }) => theme.mediaWidth.upToSmall`
-      display: flex;
-      flex-flow: column wrap;
-      padding: 0 16px;
-    `}
-
-    ${InfoCard} {
-      display: flex;
-      flex-flow: column wrap;
-      align-items: center;
-      justify-content: center;
-      gap: 0;
-      background: ${({ theme }) => theme.gradient2};
-      border-radius: 16px;
-      padding: 20px 26px 26px;
-      min-height: 210px;
-      width: 100%;
-      max-width: 100%;
-      margin: 0;
-    }
-
-    ${InfoCard} > div {
-      display: flex;
-      flex-flow: column wrap;
-      align-items: center;
-      justify-content: center;
-
-      &:first-child {
-        margin: 20px auto 0;
-      }
-
-      &:last-child {
-        margin: auto 0 0;
-      }
-    }
-
-    ${InfoCard} > div > span {
-      display: flex;
-      flex-flow: column wrap;
-      align-items: center;
-      justify-content: center;
-    }
-
-    ${InfoCard} > div > span > i,
-    ${InfoCard} > div > a,
-    ${InfoCard} > div > span > p {
-      display: flex;
-      font-size: 13px;
-      font-style: normal;
-      font-weight: 500;
-      line-height: 1.1;
-      width: 100%;
-      text-align: center;
-      justify-content: center;
-      align-items: center;
-      color: ${({ theme }) => transparentize(0.3, theme.text1)};
-    }
-
-    ${InfoCard} > div > span > p {
-      color: ${({ theme }) => theme.text1};
-    }
-
-    ${InfoCard} > div > span > b {
-      font-size: 28px;
-      font-weight: bold;
-      color: ${({ theme }) => theme.success};
-      width: 100%;
-      text-align: center;
-      margin: 20px auto 0;
-      word-break: break-all;
-    }
-
-    ${InfoCard} > div > a {
-      margin: 20px auto 0;
-    }
-
-    ${InfoCard} > div > small {
-      font-size: 15px;
-      font-weight: 500;
-      line-height: 1.1;
-      color: ${({ theme }) => transparentize(0.5, theme.text1)};
-      margin: 3px auto 0;
-    }
-
-    ${QuestionWrapper} {
-      opacity: 0.5;
-      transition: opacity 0.2s ease-in-out;
-
-      &:hover {
-        opacity: 1;
-      }
-    }
-  `
-
   return (
-    <Wrapper>
+    <SurplusCardWrapper>
       <InfoCard>
         <div>
           <span>
@@ -159,6 +51,6 @@ export function SurplusCard() {
           </ExternalLink>
         </div>
       </InfoCard>
-    </Wrapper>
+    </SurplusCardWrapper>
   )
 }
diff --git a/src/modules/account/containers/AccountDetails/styled.ts b/src/modules/account/containers/AccountDetails/styled.ts
index 73d94b44d4..c248a7d7c2 100644
--- a/src/modules/account/containers/AccountDetails/styled.ts
+++ b/src/modules/account/containers/AccountDetails/styled.ts
@@ -1,8 +1,10 @@
+import { transparentize } from 'polished'
 import styled from 'styled-components/macro'
 
 import { ButtonSecondary } from 'legacy/components/Button'
 import { YellowCard } from 'legacy/components/Card'
 import { CopyIcon, TransactionStatusText } from 'legacy/components/Copy'
+import { QuestionWrapper } from 'legacy/components/QuestionHelper'
 import { ExternalLink, StyledLink } from 'legacy/theme'
 
 import {
@@ -440,3 +442,108 @@ export const NetworkCard = styled(NetworkCardUni)`
     margin: 0 auto 12px;
   `};
 `
+
+export const SurplusCardWrapper = styled.div`
+  margin: 0 auto 24px;
+  width: 100%;
+  display: grid;
+  align-items: center;
+  justify-content: center;
+  grid-template-columns: 1fr;
+  gap: 24px;
+  box-sizing: border-box;
+  padding: 0 24px;
+
+  ${({ theme }) => theme.mediaWidth.upToSmall`
+      display: flex;
+      flex-flow: column wrap;
+      padding: 0 16px;
+    `}
+
+  ${InfoCard} {
+    display: flex;
+    flex-flow: column wrap;
+    align-items: center;
+    justify-content: center;
+    gap: 0;
+    background: ${({ theme }) => theme.gradient2};
+    border-radius: 16px;
+    padding: 20px 26px 26px;
+    min-height: 210px;
+    width: 100%;
+    max-width: 100%;
+    margin: 0;
+  }
+
+  ${InfoCard} > div {
+    display: flex;
+    flex-flow: column wrap;
+    align-items: center;
+    justify-content: center;
+
+    &:first-child {
+      margin: 20px auto 0;
+    }
+
+    &:last-child {
+      margin: auto 0 0;
+    }
+  }
+
+  ${InfoCard} > div > span {
+    display: flex;
+    flex-flow: column wrap;
+    align-items: center;
+    justify-content: center;
+  }
+
+  ${InfoCard} > div > span > i,
+    ${InfoCard} > div > a,
+    ${InfoCard} > div > span > p {
+    display: flex;
+    font-size: 13px;
+    font-style: normal;
+    font-weight: 500;
+    line-height: 1.1;
+    width: 100%;
+    text-align: center;
+    justify-content: center;
+    align-items: center;
+    color: ${({ theme }) => transparentize(0.3, theme.text1)};
+  }
+
+  ${InfoCard} > div > span > p {
+    color: ${({ theme }) => theme.text1};
+  }
+
+  ${InfoCard} > div > span > b {
+    font-size: 28px;
+    font-weight: bold;
+    color: ${({ theme }) => theme.success};
+    width: 100%;
+    text-align: center;
+    margin: 20px auto 0;
+    word-break: break-all;
+  }
+
+  ${InfoCard} > div > a {
+    margin: 20px auto 0;
+  }
+
+  ${InfoCard} > div > small {
+    font-size: 15px;
+    font-weight: 500;
+    line-height: 1.1;
+    color: ${({ theme }) => transparentize(0.5, theme.text1)};
+    margin: 3px auto 0;
+  }
+
+  ${QuestionWrapper} {
+    opacity: 0.5;
+    transition: opacity 0.2s ease-in-out;
+
+    &:hover {
+      opacity: 1;
+    }
+  }
+`

From 1dbb1f94fdb63f05bb8783da29a7b7cdd2e403c9 Mon Sep 17 00:00:00 2001
From: Leandro <alfetopito@users.noreply.github.com>
Date: Tue, 11 Jul 2023 01:52:51 -0700
Subject: [PATCH 61/67] feat(hackathon-surplus): add tooltip for activity modal
 surplus (#2831)

* feat(hackathon-surplus): add tooltip for activity modal surplus

* feat(hackathon-surplus): do not show 0 surplus (#2833)
---
 .../containers/AccountDetails/SurplusCard.tsx | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/modules/account/containers/AccountDetails/SurplusCard.tsx b/src/modules/account/containers/AccountDetails/SurplusCard.tsx
index c975815c90..c354d80817 100644
--- a/src/modules/account/containers/AccountDetails/SurplusCard.tsx
+++ b/src/modules/account/containers/AccountDetails/SurplusCard.tsx
@@ -8,13 +8,16 @@ import { useWalletInfo } from 'modules/wallet'
 import { FiatAmount } from 'common/pure/FiatAmount'
 import { TokenAmount } from 'common/pure/TokenAmount'
 import { useTotalSurplus } from 'common/state/totalSurplusState'
+import useNativeCurrency from 'lib/hooks/useNativeCurrency'
 
 import { InfoCard, SurplusCardWrapper } from './styled'
 
 export function SurplusCard() {
   const { surplusAmount, isLoading } = useTotalSurplus()
 
-  const surplusUsdAmount = useHigherUSDValue(surplusAmount)
+  const showSurplusAmount = surplusAmount && surplusAmount.greaterThan(0)
+  const surplusUsdAmount = useHigherUSDValue(showSurplusAmount ? surplusAmount : undefined)
+  const nativeSymbol = useNativeCurrency()?.symbol || 'ETH'
 
   // TODO: Remove these 2 lines once merged in DEVELOP (this change was cherry-picked from it, and it still needs these two lines because it doesn't have sasha refactor for supportedChainId)
   const { chainId } = useWalletInfo()
@@ -27,25 +30,26 @@ export function SurplusCard() {
         <div>
           <span>
             <i>
-              Your total surplus <QuestionHelper text={'TODO: insert tooltip'} />
+              Your total surplus{' '}
+              <QuestionHelper
+                text={`The total surplus CoW Swap has generated for you in ${nativeSymbol} across all your trades since March 2023`}
+              />
             </i>
           </span>
           <span>
             {isLoading ? (
               <p>Loading...</p>
+            ) : showSurplusAmount ? (
+              <b>
+                +<TokenAmount amount={surplusAmount} tokenSymbol={surplusAmount?.currency} />
+              </b>
             ) : (
-              surplusAmount && (
-                <b>
-                  +<TokenAmount amount={surplusAmount} tokenSymbol={surplusAmount?.currency} />
-                </b>
-              )
+              <p>No surplus for the given time period</p>
             )}
-            {!surplusAmount && <p>No surplus for the given time period</p>}
           </span>
           <small>{surplusUsdAmount && <FiatAmount amount={surplusUsdAmount} accurate={false} />}</small>
         </div>
         <div>
-          {/* TODO: add correct link */}
           <ExternalLink href={'https://blog.cow.fi/announcing-cow-swap-surplus-notifications-f679c77702ea'}>
             Learn about surplus on CoW Swap ↗
           </ExternalLink>

From 98340d73d09ab0b064c65d236885aaf20810579c Mon Sep 17 00:00:00 2001
From: Leandro <alfetopito@users.noreply.github.com>
Date: Tue, 11 Jul 2023 09:22:46 -0700
Subject: [PATCH 62/67] feat(hackathon-surplus): add missing link to surplus
 modal (#2845)

---
 src/common/pure/TransactionSubmittedContent/SurplusModal.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/common/pure/TransactionSubmittedContent/SurplusModal.tsx b/src/common/pure/TransactionSubmittedContent/SurplusModal.tsx
index 5aeeee63fb..77f50e5ce6 100644
--- a/src/common/pure/TransactionSubmittedContent/SurplusModal.tsx
+++ b/src/common/pure/TransactionSubmittedContent/SurplusModal.tsx
@@ -175,7 +175,6 @@ export function SurplusModal(props: SurplusModalProps) {
         <span>!</span>
       </strong>
       {showFiatValue && <FiatAmount amount={surplusFiatValue} accurate={false} />}
-      {/* TODO: add share data */}
       {surplusAmount && surplusToken && (
         <StyledExternalLink
           onClickOptional={onTweetShare}
@@ -191,7 +190,9 @@ export function SurplusModal(props: SurplusModalProps) {
       )}
       <p>
         CoW Swap is the only token exchange that gets you extra tokens.{' '}
-        <ExternalLink href={'https://cow.fi'}>Learn how ↗</ExternalLink>
+        <ExternalLink href={'https://blog.cow.fi/announcing-cow-swap-surplus-notifications-f679c77702ea'}>
+          Learn how ↗
+        </ExternalLink>
       </p>
     </Wrapper>
   )

From 5a6133212b456378491c80457c1deff740ea191a Mon Sep 17 00:00:00 2001
From: fairlight <31534717+fairlighteth@users.noreply.github.com>
Date: Tue, 11 Jul 2023 17:24:34 +0100
Subject: [PATCH 63/67] feat: wrap symbol name surplus modal (#2842)

---
 .../pure/TransactionSubmittedContent/SurplusModal.tsx       | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/common/pure/TransactionSubmittedContent/SurplusModal.tsx b/src/common/pure/TransactionSubmittedContent/SurplusModal.tsx
index 77f50e5ce6..07ea6d2f49 100644
--- a/src/common/pure/TransactionSubmittedContent/SurplusModal.tsx
+++ b/src/common/pure/TransactionSubmittedContent/SurplusModal.tsx
@@ -15,7 +15,7 @@ import { ExternalLink } from 'legacy/theme'
 
 import { useGetSurplusData } from 'common/hooks/useGetSurplusFiatValue'
 import { FiatAmount } from 'common/pure/FiatAmount'
-import { TokenAmount } from 'common/pure/TokenAmount'
+import { TokenAmount, SymbolElement } from 'common/pure/TokenAmount'
 
 const SELL_SURPLUS_WORD = 'got'
 const BUY_SURPLUS_WORD = 'saved'
@@ -72,6 +72,10 @@ export const Wrapper = styled.div`
     }
   }
 
+  ${SymbolElement} {
+    word-break: break-word;
+  }
+
   > span {
     width: 100%;
     display: flex;

From 5a5d7ac2dbbea20a8c2ec8355795ae0202710d1f Mon Sep 17 00:00:00 2001
From: Alexandr Kazachenko <shoom3301@gmail.com>
Date: Thu, 6 Jul 2023 13:19:51 +0600
Subject: [PATCH 64/67] refactor(swap): clean up Swap widget from
 isWrapOrUnwrap (#2775)

---
 src/legacy/hooks/usePriceImpact/index.ts      |  2 +-
 src/legacy/hooks/useWrapCallback.ts           | 68 -------------------
 src/legacy/state/swap/reducer.ts              | 17 +++--
 .../ConfirmSwapModalSetup/index.tsx           | 24 +------
 .../swap/containers/SwapWidget/index.tsx      | 21 ++----
 .../swap/containers/SwapWidget/styled.tsx     | 44 ------------
 .../swap/helpers/getSwapButtonState.ts        | 22 +-----
 src/modules/swap/hooks/useHandleSwap.test.tsx |  1 -
 .../swap/hooks/useShowRecipientControls.ts    |  7 +-
 .../swap/hooks/useSwapButtonContext.ts        | 33 +--------
 .../swap/hooks/useSwapCurrenciesAmounts.ts    | 30 ++++----
 .../swap/hooks/useTransactionConfirmModal.ts  | 20 ------
 .../swap/pure/SwapButtons/index.cosmos.tsx    |  2 -
 src/modules/swap/pure/SwapButtons/index.tsx   | 17 -----
 .../swap/state/transactionConfirmAtom.ts      | 13 ----
 .../tokens/hooks/useOnchainBalances.ts        |  4 +-
 .../trade/containers/TradeWidget/index.tsx    |  4 +-
 src/modules/trade/hooks/useIsNativeInOrOut.ts | 17 +----
 src/modules/trade/hooks/useIsWrapOrUnwrap.ts  | 17 +----
 .../trade/hooks/useTradePriceImpactParams.ts  | 16 +++--
 src/modules/trade/hooks/useWrapNativeFlow.ts  | 15 ++--
 .../trade/updaters/PriceImpactUpdater.tsx     |  2 +-
 .../pure/TradeFormButtons/tradeButtonsMap.tsx |  5 +-
 .../services/validateTradeForm.ts             | 36 +++++-----
 src/modules/tradeFormValidation/types.ts      |  1 -
 src/utils/getIsNativeToken.ts                 | 16 +++++
 src/utils/getIsWrapOrUnwrap.ts                | 27 ++++++++
 27 files changed, 131 insertions(+), 350 deletions(-)
 delete mode 100644 src/modules/swap/containers/SwapWidget/styled.tsx
 delete mode 100644 src/modules/swap/hooks/useTransactionConfirmModal.ts
 delete mode 100644 src/modules/swap/state/transactionConfirmAtom.ts
 create mode 100644 src/utils/getIsNativeToken.ts
 create mode 100644 src/utils/getIsWrapOrUnwrap.ts

diff --git a/src/legacy/hooks/usePriceImpact/index.ts b/src/legacy/hooks/usePriceImpact/index.ts
index b4bd615928..6a9d539ad0 100644
--- a/src/legacy/hooks/usePriceImpact/index.ts
+++ b/src/legacy/hooks/usePriceImpact/index.ts
@@ -26,7 +26,7 @@ export interface PriceImpact {
  * Warning!
  * The hook cannot be used more the once in the same page
  */
-export default function usePriceImpact({ abTrade, parsedAmounts, isWrapping }: PriceImpactParams): PriceImpact {
+export function usePriceImpact({ abTrade, parsedAmounts, isWrapping }: PriceImpactParams): PriceImpact {
   const fiatPriceImpact = useFiatValuePriceImpact(parsedAmounts)
   const {
     impact: fallbackPriceImpact,
diff --git a/src/legacy/hooks/useWrapCallback.ts b/src/legacy/hooks/useWrapCallback.ts
index 5a1d65894a..5c7dce21ad 100644
--- a/src/legacy/hooks/useWrapCallback.ts
+++ b/src/legacy/hooks/useWrapCallback.ts
@@ -4,22 +4,14 @@ import { Contract } from '@ethersproject/contracts'
 import { TransactionResponse } from '@ethersproject/providers'
 import { Currency, CurrencyAmount } from '@uniswap/sdk-core'
 
-import { Nullish } from 'types'
-
 import { wrapAnalytics } from 'legacy/components/analytics'
 import { ConfirmOperationType } from 'legacy/components/TransactionConfirmationModal'
 import { getOperationMessage } from 'legacy/components/TransactionConfirmationModal/LegacyConfirmationPendingContent'
 import { RADIX_HEX } from 'legacy/constants'
-import { useWETHContract } from 'legacy/hooks/useContract'
-import { useCloseModals } from 'legacy/state/application/hooks'
 import { useTransactionAdder } from 'legacy/state/enhancedTransactions/hooks'
 import { calculateGasMargin } from 'legacy/utils/calculateGasMargin'
 import { getChainCurrencySymbols } from 'legacy/utils/gnosis_chain/hack'
 
-import { useTransactionConfirmModal } from 'modules/swap/hooks/useTransactionConfirmModal'
-import { useNativeTokenContext } from 'modules/trade/hooks/useNativeTokenContext'
-import { useWalletInfo } from 'modules/wallet'
-
 import { formatTokenAmount } from 'utils/amountFormat'
 
 import { isRejectRequestProviderError } from '../utils/misc'
@@ -27,12 +19,6 @@ import { isRejectRequestProviderError } from '../utils/misc'
 // Use a 180K gas as a fallback if there's issue calculating the gas estimation (fixes some issues with some nodes failing to calculate gas costs for SC wallets)
 const WRAP_UNWRAP_GAS_LIMIT_DEFAULT = BigNumber.from('180000')
 
-export enum WrapType {
-  NOT_APPLICABLE,
-  WRAP,
-  UNWRAP,
-}
-
 export interface WrapUnwrapCallbackParams {
   useModals?: boolean
 }
@@ -58,60 +44,6 @@ export interface WrapUnwrapContext {
   openTransactionConfirmationModal: OpenSwapConfirmModalCallback
 }
 
-export function useWrapType(): WrapType {
-  const { isNativeIn, isNativeOut, isWrappedIn, isWrappedOut } = useNativeTokenContext()
-
-  const isWrap = isNativeIn && isWrappedOut
-  const isUnwrap = isWrappedIn && isNativeOut
-  const isWrapOrUnwrapApplicable = isWrap || isUnwrap
-
-  if (!isWrapOrUnwrapApplicable) {
-    return WrapType.NOT_APPLICABLE
-  }
-
-  return isNativeIn ? WrapType.WRAP : WrapType.UNWRAP
-}
-
-export function useWrapUnwrapContext(inputAmount: Nullish<CurrencyAmount<Currency>>): WrapUnwrapContext | null {
-  const { chainId } = useWalletInfo()
-  const closeModals = useCloseModals()
-  const wethContract = useWETHContract()
-  const addTransaction = useTransactionAdder()
-  const openTxConfirmationModal = useTransactionConfirmModal()
-
-  if (!wethContract || !chainId || !inputAmount) {
-    return null
-  }
-
-  const openTransactionConfirmationModal = (pendingText: string, operationType: ConfirmOperationType) => {
-    openTxConfirmationModal({ operationType, pendingText })
-  }
-
-  return {
-    chainId,
-    wethContract,
-    amount: inputAmount,
-    addTransaction,
-    closeModals,
-    openTransactionConfirmationModal,
-  }
-}
-
-/**
- * Given the selected input and output currency, return a wrap callback
- */
-export function useWrapCallback(inputAmount: CurrencyAmount<Currency> | null | undefined): WrapUnwrapCallback | null {
-  const context = useWrapUnwrapContext(inputAmount)
-
-  if (!context) {
-    return null
-  }
-
-  return (params?: WrapUnwrapCallbackParams) => {
-    return wrapUnwrapCallback(context, params)
-  }
-}
-
 export async function wrapUnwrapCallback(
   context: WrapUnwrapContext,
   params: WrapUnwrapCallbackParams = { useModals: true }
diff --git a/src/legacy/state/swap/reducer.ts b/src/legacy/state/swap/reducer.ts
index c7ebef5b85..06b74ad661 100644
--- a/src/legacy/state/swap/reducer.ts
+++ b/src/legacy/state/swap/reducer.ts
@@ -16,6 +16,9 @@ import {
 } from 'legacy/state/swap/actions'
 import { queryParametersToSwapState } from 'legacy/state/swap/hooks'
 
+import { getIsNativeToken } from 'utils/getIsNativeToken'
+import { getIsWrapOrUnwrap } from 'utils/getIsWrapOrUnwrap'
+
 export interface SwapState {
   // Mod: added chainId
   chainId: number | null
@@ -143,10 +146,16 @@ export default createReducer<SwapState>(initialState, (builder) =>
 function getEthFlowOverridesOnSwitch(state: SwapState): Pick<SwapState, 'independentField' | 'typedValue'> {
   const chainId: ChainId = state.chainId || ChainId.MAINNET
 
-  const isNativeOut =
-    state[Field.OUTPUT].currencyId?.toUpperCase() === NATIVE_CURRENCY_BUY_TOKEN[chainId].symbol?.toUpperCase()
-  const isWrappedIn =
-    state[Field.INPUT].currencyId?.toUpperCase() === WRAPPED_NATIVE_CURRENCY[chainId].symbol?.toUpperCase()
+  const inputCurrencyId = state[Field.INPUT].currencyId?.toUpperCase()
+  const outputCurrencyId = state[Field.OUTPUT].currencyId?.toUpperCase()
+
+  const isNativeOut = getIsNativeToken(chainId, outputCurrencyId || '')
+  const isWrapUnwrap = getIsWrapOrUnwrap(chainId, inputCurrencyId, outputCurrencyId)
+  const isWrappedIn = inputCurrencyId === WRAPPED_NATIVE_CURRENCY[chainId].symbol?.toUpperCase()
+
+  if (isWrapUnwrap) {
+    return state
+  }
 
   const formerIndependentField = state.independentField
 
diff --git a/src/modules/swap/containers/ConfirmSwapModalSetup/index.tsx b/src/modules/swap/containers/ConfirmSwapModalSetup/index.tsx
index 67d55338f7..749fca564e 100644
--- a/src/modules/swap/containers/ConfirmSwapModalSetup/index.tsx
+++ b/src/modules/swap/containers/ConfirmSwapModalSetup/index.tsx
@@ -4,10 +4,6 @@ import { useCallback } from 'react'
 import { Percent } from '@uniswap/sdk-core'
 
 import { ConfirmSwapModal } from 'legacy/components/swap/ConfirmSwapModal'
-import { TransactionConfirmationModal } from 'legacy/components/TransactionConfirmationModal'
-import { useCloseModals } from 'legacy/state/application/hooks'
-import { useModalIsOpen } from 'legacy/state/application/hooks'
-import { ApplicationModal } from 'legacy/state/application/reducer'
 import { Field } from 'legacy/state/swap/actions'
 import { useSwapActionHandlers } from 'legacy/state/swap/hooks'
 import TradeGp from 'legacy/state/swap/TradeGp'
@@ -15,7 +11,6 @@ import TradeGp from 'legacy/state/swap/TradeGp'
 import { useSwapConfirmManager } from 'modules/swap/hooks/useSwapConfirmManager'
 import { HandleSwapCallback } from 'modules/swap/pure/SwapButtons'
 import { swapConfirmAtom } from 'modules/swap/state/swapConfirmAtom'
-import { transactionConfirmAtom } from 'modules/swap/state/transactionConfirmAtom'
 
 import { RateInfoParams } from 'common/pure/RateInfo'
 
@@ -26,23 +21,14 @@ export interface ConfirmSwapModalSetupProps {
   handleSwap: HandleSwapCallback
   priceImpact?: Percent
   rateInfoParams: RateInfoParams
-  dismissNativeWrapModal(): void
 }
 
 export function ConfirmSwapModalSetup(props: ConfirmSwapModalSetupProps) {
-  const { trade, recipient, allowedSlippage, priceImpact, handleSwap, dismissNativeWrapModal, rateInfoParams } = props
+  const { trade, recipient, allowedSlippage, priceImpact, handleSwap, rateInfoParams } = props
 
   const swapConfirmState = useAtomValue(swapConfirmAtom)
-  const { operationType, pendingText } = useAtomValue(transactionConfirmAtom)
   const { acceptRateUpdates, closeSwapConfirm } = useSwapConfirmManager()
   const { onUserInput } = useSwapActionHandlers()
-  const closeModals = useCloseModals()
-  const showTransactionConfirmationModal = useModalIsOpen(ApplicationModal.TRANSACTION_CONFIRMATION)
-
-  const onDismiss = useCallback(() => {
-    closeModals()
-    dismissNativeWrapModal()
-  }, [closeModals, dismissNativeWrapModal])
 
   const handleAcceptChanges = useCallback(() => {
     trade && acceptRateUpdates(trade)
@@ -70,14 +56,6 @@ export function ConfirmSwapModalSetup(props: ConfirmSwapModalSetupProps) {
         onConfirm={handleSwap}
         onDismiss={handleConfirmDismiss}
       />
-
-      <TransactionConfirmationModal
-        attemptingTxn={true}
-        isOpen={showTransactionConfirmationModal}
-        pendingText={pendingText}
-        onDismiss={onDismiss}
-        operationType={operationType}
-      />
     </>
   )
 }
diff --git a/src/modules/swap/containers/SwapWidget/index.tsx b/src/modules/swap/containers/SwapWidget/index.tsx
index f7844c504d..d4e0cb003f 100644
--- a/src/modules/swap/containers/SwapWidget/index.tsx
+++ b/src/modules/swap/containers/SwapWidget/index.tsx
@@ -3,9 +3,7 @@ import React, { useState } from 'react'
 import { NetworkAlert } from 'legacy/components/NetworkAlert/NetworkAlert'
 import SettingsTab from 'legacy/components/Settings'
 import useCowBalanceAndSubsidy from 'legacy/hooks/useCowBalanceAndSubsidy'
-import usePriceImpact from 'legacy/hooks/usePriceImpact'
 import { useHigherUSDValue } from 'legacy/hooks/useStablecoinPrice'
-import { useWrapType, WrapType } from 'legacy/hooks/useWrapCallback'
 import { useModalIsOpen } from 'legacy/state/application/hooks'
 import { ApplicationModal } from 'legacy/state/application/reducer'
 import { useIsTradeUnsupported } from 'legacy/state/lists/hooks'
@@ -41,7 +39,7 @@ import {
 } from 'modules/swap/pure/warnings'
 import { useFillSwapDerivedState } from 'modules/swap/state/useSwapDerivedState'
 import useCurrencyBalance from 'modules/tokens/hooks/useCurrencyBalance'
-import { TradeWidget, TradeWidgetContainer, useSetupTradeState } from 'modules/trade'
+import { TradeWidget, TradeWidgetContainer, useSetupTradeState, useTradePriceImpact } from 'modules/trade'
 import { useWrappedToken } from 'modules/trade/hooks/useWrappedToken'
 import { useIsSafeViaWc, useIsSafeWallet, useWalletDetails, useWalletInfo } from 'modules/wallet'
 
@@ -71,8 +69,7 @@ export function SwapWidget() {
     currenciesIds,
     v2Trade: trade,
   } = useDerivedSwapInfo()
-  const wrapType = useWrapType()
-  const parsedAmounts = useSwapCurrenciesAmounts(wrapType)
+  const parsedAmounts = useSwapCurrenciesAmounts()
   const { isSupportedWallet, allowsOffchainSigning } = useWalletDetails()
   const isSwapUnsupported = useIsTradeUnsupported(currencies.INPUT, currencies.OUTPUT)
   const [isExpertMode] = useExpertModeManager()
@@ -85,12 +82,7 @@ export function SwapWidget() {
   const isEoaEthFlow = useIsEoaEthFlow()
   const shouldZeroApprove = useShouldZeroApprove(slippageAdjustedSellAmount)
 
-  const isWrapUnwrapMode = wrapType !== WrapType.NOT_APPLICABLE
-  const priceImpactParams = usePriceImpact({
-    abTrade: trade,
-    parsedAmounts,
-    isWrapping: isWrapUnwrapMode,
-  })
+  const priceImpactParams = useTradePriceImpact()
 
   const isTradePriceUpdating = useTradePricesUpdate()
   const { isFeeGreater, fee } = useIsFeeGreaterThanInput({
@@ -147,7 +139,6 @@ export function SwapWidget() {
     allowedSlippage,
     handleSwap: swapButtonContext.handleSwap,
     priceImpact: priceImpactParams.priceImpact,
-    dismissNativeWrapModal,
     rateInfoParams,
   }
 
@@ -194,7 +185,7 @@ export function SwapWidget() {
     feeWarningAccepted,
     impactWarningAccepted,
     // don't show the unknown impact warning on: no trade, wrapping native, no error, or it's loading impact
-    hideUnknownImpactWarning: !trade || isWrapUnwrapMode || !priceImpactParams.error || priceImpactParams.loading,
+    hideUnknownImpactWarning: !trade || !priceImpactParams.error || priceImpactParams.loading,
     isExpertMode,
     showApprovalBundlingBanner,
     showWrapBundlingBanner,
@@ -225,13 +216,11 @@ export function SwapWidget() {
     rateInfoParams,
   }
 
-  const showTradeRates = !isWrapUnwrapMode
-
   const slots = {
     settingsWidget: <SettingsTab placeholderSlippage={allowedSlippage} />,
     bottomContent: (
       <>
-        {showTradeRates && <TradeRates {...tradeRatesProps} />}
+        <TradeRates {...tradeRatesProps} />
         <SwapWarningsTop {...swapWarningsTopProps} />
         <SwapButtons {...swapButtonContext} />
         <SwapWarningsBottom {...swapWarningsBottomProps} />
diff --git a/src/modules/swap/containers/SwapWidget/styled.tsx b/src/modules/swap/containers/SwapWidget/styled.tsx
deleted file mode 100644
index 4596cc5cc6..0000000000
--- a/src/modules/swap/containers/SwapWidget/styled.tsx
+++ /dev/null
@@ -1,44 +0,0 @@
-import styled from 'styled-components/macro'
-
-import SwapHeader from 'legacy/components/swap/SwapHeader'
-
-import { SetRecipient } from 'modules/swap/containers/SetRecipient'
-
-import { LoadingWrapper } from 'common/pure/CurrencyArrowSeparator/styled'
-
-export const Header = styled.div`
-  display: flex;
-  justify-content: space-between;
-  padding: 0 12px 4px;
-  margin: 5px 0 15px 0;
-  font-weight: 500;
-  font-size: 16px;
-`
-
-export const SwapFormWrapper = styled.div`
-  margin: 0 0 10px;
-
-  ${LoadingWrapper} {
-    ${({ theme }) => theme.mediaWidth.upToSmall`
-      --size: 24px;
-      height: var(--size);
-      width: var(--size);
-      left: calc(50% - var(--size)/2);
-      border-radius: var(--size);
-  `};
-  }
-`
-
-export const CurrencySeparatorBox = styled.div<{ withRecipient: boolean }>`
-  display: flex;
-  justify-content: space-between;
-  margin: ${({ withRecipient }) => (withRecipient ? '10px' : '1px 0')};
-`
-
-export const SwapHeaderStyled = styled(SwapHeader)`
-  padding: 4px 4px 16px 8px;
-`
-
-export const SetRecipientStyled = styled(SetRecipient)`
-  margin: 10px 0;
-`
diff --git a/src/modules/swap/helpers/getSwapButtonState.ts b/src/modules/swap/helpers/getSwapButtonState.ts
index 6f46504e6f..74e7d390bd 100644
--- a/src/modules/swap/helpers/getSwapButtonState.ts
+++ b/src/modules/swap/helpers/getSwapButtonState.ts
@@ -1,7 +1,6 @@
 import { Token } from '@uniswap/sdk-core'
 
 import { ApprovalState } from 'legacy/hooks/useApproveCallback'
-import { WrapType } from 'legacy/hooks/useWrapCallback'
 import { QuoteError } from 'legacy/state/price/actions'
 import TradeGp from 'legacy/state/swap/TradeGp'
 
@@ -10,9 +9,6 @@ import { getEthFlowEnabled } from 'modules/swap/helpers/getEthFlowEnabled'
 export enum SwapButtonState {
   SwapIsUnsupported = 'SwapIsUnsupported',
   WalletIsUnsupported = 'WalletIsUnsupported',
-  WrapError = 'WrapError',
-  ShouldWrapNativeToken = 'ShouldWrapNativeToken',
-  ShouldUnwrapNativeToken = 'ShouldUnwrapNativeToken',
   FeesExceedFromAmount = 'FeesExceedFromAmount',
   InsufficientLiquidity = 'InsufficientLiquidity',
   ZeroPrice = 'ZeroPrice',
@@ -46,8 +42,6 @@ export interface SwapButtonStateParams {
   isSwapUnsupported: boolean
   isTxBundlingEnabled: boolean
   isEthFlowBundlingEnabled: boolean
-  wrapType: WrapType
-  wrapInputError: string | undefined
   quoteError: QuoteError | undefined | null
   inputError?: string
   approvalState: ApprovalState
@@ -73,7 +67,7 @@ const quoteErrorToSwapButtonState: { [key in QuoteError]: SwapButtonState | null
 }
 
 export function getSwapButtonState(input: SwapButtonStateParams): SwapButtonState {
-  const { wrapType, quoteError, approvalState } = input
+  const { quoteError, approvalState } = input
 
   // show approve flow when: no error on inputs, not approved or pending, or approved in current session
   // never show if price impact is above threshold in non expert mode
@@ -83,7 +77,7 @@ export function getSwapButtonState(input: SwapButtonStateParams): SwapButtonStat
   const isValid = !input.inputError && input.feeWarningAccepted && input.impactWarningAccepted
   const swapBlankState = !input.inputError && !input.trade
 
-  if (quoteError && ![WrapType.WRAP, WrapType.UNWRAP].includes(wrapType)) {
+  if (quoteError) {
     const quoteErrorState = quoteErrorToSwapButtonState[quoteError]
 
     if (quoteErrorState) return quoteErrorState
@@ -101,18 +95,6 @@ export function getSwapButtonState(input: SwapButtonStateParams): SwapButtonStat
     return SwapButtonState.WalletIsUnsupported
   }
 
-  if (wrapType !== WrapType.NOT_APPLICABLE && input.wrapInputError) {
-    return SwapButtonState.WrapError
-  }
-
-  if (wrapType === WrapType.WRAP) {
-    return SwapButtonState.ShouldWrapNativeToken
-  }
-
-  if (wrapType === WrapType.UNWRAP) {
-    return SwapButtonState.ShouldUnwrapNativeToken
-  }
-
   if (swapBlankState || input.isGettingNewQuote || input.isBestQuoteLoading) {
     return SwapButtonState.Loading
   }
diff --git a/src/modules/swap/hooks/useHandleSwap.test.tsx b/src/modules/swap/hooks/useHandleSwap.test.tsx
index 5cb5bca3af..4a00a9a4fe 100644
--- a/src/modules/swap/hooks/useHandleSwap.test.tsx
+++ b/src/modules/swap/hooks/useHandleSwap.test.tsx
@@ -23,7 +23,6 @@ jest.mock('legacy/state/swap/hooks')
 jest.mock('modules/swap/services/swapFlow')
 jest.mock('modules/swap/services/ethFlow')
 jest.mock('modules/swap/services/safeBundleFlow')
-jest.mock('modules/swap/state/transactionConfirmAtom')
 
 const mockUseSwapActionHandlers = useSwapActionHandlers as jest.MockedFunction<typeof useSwapActionHandlers>
 const mockSwapFlow = swapFlow as jest.MockedFunction<typeof swapFlow>
diff --git a/src/modules/swap/hooks/useShowRecipientControls.ts b/src/modules/swap/hooks/useShowRecipientControls.ts
index da53edb6f7..a2bd7b328f 100644
--- a/src/modules/swap/hooks/useShowRecipientControls.ts
+++ b/src/modules/swap/hooks/useShowRecipientControls.ts
@@ -1,14 +1,11 @@
 import { useMemo } from 'react'
 
-import { useWrapType, WrapType } from 'legacy/hooks/useWrapCallback'
 import { useIsRecipientToggleVisible } from 'legacy/state/user/hooks'
 
 export function useShowRecipientControls(recipient: string | null): boolean {
-  const wrapType = useWrapType()
-  const isWrapUnwrap = wrapType !== WrapType.NOT_APPLICABLE
   const isRecipientToggleVisible = useIsRecipientToggleVisible()
 
   return useMemo(() => {
-    return !isWrapUnwrap && (isRecipientToggleVisible || !!recipient)
-  }, [isWrapUnwrap, isRecipientToggleVisible, recipient])
+    return isRecipientToggleVisible || !!recipient
+  }, [isRecipientToggleVisible, recipient])
 }
diff --git a/src/modules/swap/hooks/useSwapButtonContext.ts b/src/modules/swap/hooks/useSwapButtonContext.ts
index 8a13005ddd..4ac0493a34 100644
--- a/src/modules/swap/hooks/useSwapButtonContext.ts
+++ b/src/modules/swap/hooks/useSwapButtonContext.ts
@@ -1,16 +1,12 @@
 import { Currency, CurrencyAmount } from '@uniswap/sdk-core'
 
-import { t } from '@lingui/macro'
-
 import { PriceImpact } from 'legacy/hooks/usePriceImpact'
-import { useWrapCallback, useWrapType, WrapType } from 'legacy/hooks/useWrapCallback'
 import { useToggleWalletModal } from 'legacy/state/application/hooks'
 import { useIsTradeUnsupported } from 'legacy/state/lists/hooks'
 import { useGetQuoteAndStatus, useIsBestQuoteLoading } from 'legacy/state/price/hooks'
 import { Field } from 'legacy/state/swap/actions'
 import { useDerivedSwapInfo, useSwapActionHandlers } from 'legacy/state/swap/hooks'
 import { useExpertModeManager } from 'legacy/state/user/hooks'
-import { getChainCurrencySymbols } from 'legacy/utils/gnosis_chain/hack'
 
 import { getSwapButtonState } from 'modules/swap/helpers/getSwapButtonState'
 import { useEthFlowContext } from 'modules/swap/hooks/useEthFlowContext'
@@ -20,6 +16,7 @@ import { useSwapConfirmManager } from 'modules/swap/hooks/useSwapConfirmManager'
 import { useSwapFlowContext } from 'modules/swap/hooks/useSwapFlowContext'
 import { SwapButtonsContext } from 'modules/swap/pure/SwapButtons'
 import useCurrencyBalance from 'modules/tokens/hooks/useCurrencyBalance'
+import { useWrapNativeFlow } from 'modules/trade'
 import { useIsNativeIn } from 'modules/trade/hooks/useIsNativeInOrOut'
 import { useIsWrappedOut } from 'modules/trade/hooks/useIsWrappedInOrOut'
 import { useWrappedToken } from 'modules/trade/hooks/useWrappedToken'
@@ -29,7 +26,6 @@ import { useTradeApproveState } from 'common/containers/TradeApprove/useTradeApp
 import { useIsEthFlowBundlingEnabled } from 'common/hooks/featureFlags/useIsEthFlowBundlingEnabled'
 import { useIsTxBundlingEnabled } from 'common/hooks/featureFlags/useIsTxBundlingEnabled'
 import { useIsSmartContractWallet } from 'common/hooks/useIsSmartContractWallet'
-import { formatSymbol } from 'utils/format'
 
 import { useSafeBundleEthFlowContext } from './useSafeBundleEthFlowContext'
 
@@ -78,10 +74,8 @@ export function useSwapButtonContext(input: SwapButtonInput): SwapButtonsContext
 
   const inputAmount = slippageAdjustedSellAmount || parsedAmount
   const wrapUnwrapAmount = isNativeInSwap ? inputAmount?.wrapped : inputAmount
-  const wrapType = useWrapType()
-  const wrapInputError = useWrapUnwrapError(wrapType, wrapUnwrapAmount)
   const hasEnoughWrappedBalanceForSwap = useHasEnoughWrappedBalanceForSwap(wrapUnwrapAmount)
-  const wrapCallback = useWrapCallback(wrapUnwrapAmount)
+  const wrapCallback = useWrapNativeFlow()
   const approvalState = useTradeApproveState(slippageAdjustedSellAmount || null)
 
   const handleSwap = useHandleSwap(priceImpactParams)
@@ -107,8 +101,6 @@ export function useSwapButtonContext(input: SwapButtonInput): SwapButtonsContext
     isSwapUnsupported,
     isNativeIn: isNativeInSwap,
     wrappedToken,
-    wrapType,
-    wrapInputError,
     quoteError: quote?.error,
     inputError: swapInputError,
     approvalState,
@@ -126,8 +118,6 @@ export function useSwapButtonContext(input: SwapButtonInput): SwapButtonsContext
     chainId,
     wrappedToken,
     handleSwap,
-    wrapInputError,
-    wrapUnwrapAmount,
     hasEnoughWrappedBalanceForSwap,
     onWrapOrUnwrap: wrapCallback,
     onEthFlow() {
@@ -142,25 +132,6 @@ export function useSwapButtonContext(input: SwapButtonInput): SwapButtonsContext
   }
 }
 
-// TODO: get rid of it. The validation should be handled by modules/tradeFormValidation
-function useWrapUnwrapError(wrapType: WrapType, inputAmount?: CurrencyAmount<Currency>): string | undefined {
-  const { chainId, account } = useWalletInfo()
-  const { currencies } = useDerivedSwapInfo()
-  const { native, wrapped } = getChainCurrencySymbols(chainId)
-  const balance = useCurrencyBalance(account ?? undefined, currencies.INPUT)
-
-  const symbol = wrapType === WrapType.WRAP ? native : wrapped
-  // Check if user has enough balance for wrap/unwrap
-  const sufficientBalance = !!(inputAmount && balance && !balance.lessThan(inputAmount))
-  const isZero = balance && !inputAmount
-
-  if (isZero) {
-    return t`Enter an amount`
-  }
-
-  return !sufficientBalance ? t`Insufficient ${formatSymbol(symbol)} balance` : undefined
-}
-
 function useHasEnoughWrappedBalanceForSwap(inputAmount?: CurrencyAmount<Currency>): boolean {
   const { currencies } = useDerivedSwapInfo()
   const { account } = useWalletInfo()
diff --git a/src/modules/swap/hooks/useSwapCurrenciesAmounts.ts b/src/modules/swap/hooks/useSwapCurrenciesAmounts.ts
index 4a5ea56815..60036372c1 100644
--- a/src/modules/swap/hooks/useSwapCurrenciesAmounts.ts
+++ b/src/modules/swap/hooks/useSwapCurrenciesAmounts.ts
@@ -1,25 +1,31 @@
+import { useMemo } from 'react'
+
 import { ParsedAmounts } from 'legacy/hooks/usePriceImpact/types'
-import { WrapType } from 'legacy/hooks/useWrapCallback'
 import { Field } from 'legacy/state/swap/actions'
 import { useSwapState } from 'legacy/state/swap/hooks'
 import { useDerivedSwapInfo } from 'legacy/state/swap/hooks'
 
-export function useSwapCurrenciesAmounts(wrapType: WrapType): ParsedAmounts {
+import { useSafeMemoObject } from 'common/hooks/useSafeMemo'
+
+export function useSwapCurrenciesAmounts(): ParsedAmounts {
   const { independentField } = useSwapState()
   const { v2Trade: trade, parsedAmount } = useDerivedSwapInfo()
 
   const isInputIndependent = independentField === Field.INPUT
-  const isWrapUnwrapMode = wrapType !== WrapType.NOT_APPLICABLE
+  const inputAmountWithoutFee = trade?.inputAmountWithoutFee
+  const outputAmountWithoutFee = trade?.outputAmountWithoutFee
 
-  if (isWrapUnwrapMode) {
+  const context = useSafeMemoObject({
+    parsedAmount,
+    inputAmountWithoutFee,
+    outputAmountWithoutFee,
+  })
+
+  return useMemo(() => {
+    const { parsedAmount, inputAmountWithoutFee, outputAmountWithoutFee } = context
     return {
-      [Field.INPUT]: parsedAmount,
-      [Field.OUTPUT]: parsedAmount,
+      [Field.INPUT]: isInputIndependent ? parsedAmount : inputAmountWithoutFee,
+      [Field.OUTPUT]: isInputIndependent ? outputAmountWithoutFee : parsedAmount,
     }
-  }
-
-  return {
-    [Field.INPUT]: isInputIndependent ? parsedAmount : trade?.inputAmountWithoutFee,
-    [Field.OUTPUT]: isInputIndependent ? trade?.outputAmountWithoutFee : parsedAmount,
-  }
+  }, [isInputIndependent, context])
 }
diff --git a/src/modules/swap/hooks/useTransactionConfirmModal.ts b/src/modules/swap/hooks/useTransactionConfirmModal.ts
deleted file mode 100644
index ca5b5fe690..0000000000
--- a/src/modules/swap/hooks/useTransactionConfirmModal.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { useUpdateAtom } from 'jotai/utils'
-import { useCallback } from 'react'
-
-import { useOpenModal } from 'legacy/state/application/hooks'
-import { ApplicationModal } from 'legacy/state/application/reducer'
-
-import { transactionConfirmAtom, TransactionConfirmState } from 'modules/swap/state/transactionConfirmAtom'
-
-export function useTransactionConfirmModal() {
-  const setTransactionConfirm = useUpdateAtom(transactionConfirmAtom)
-  const openTxConfirmationModal = useOpenModal(ApplicationModal.TRANSACTION_CONFIRMATION)
-
-  return useCallback(
-    (state: TransactionConfirmState) => {
-      setTransactionConfirm(state)
-      openTxConfirmationModal()
-    },
-    [setTransactionConfirm, openTxConfirmationModal]
-  )
-}
diff --git a/src/modules/swap/pure/SwapButtons/index.cosmos.tsx b/src/modules/swap/pure/SwapButtons/index.cosmos.tsx
index 218a0505f0..e848722118 100644
--- a/src/modules/swap/pure/SwapButtons/index.cosmos.tsx
+++ b/src/modules/swap/pure/SwapButtons/index.cosmos.tsx
@@ -21,8 +21,6 @@ const swapButtonsContext: SwapButtonsContext = {
   wrappedToken: WETH_GOERLI,
   handleSwap: () => void 0,
   inputAmount: CurrencyAmount.fromRawAmount(currency, amount * 10 ** 18),
-  wrapUnwrapAmount: CurrencyAmount.fromRawAmount(WETH_GOERLI, 10000000),
-  wrapInputError: undefined,
   onWrapOrUnwrap: null,
   onEthFlow: () => void 0,
   openSwapConfirm: () => void 0,
diff --git a/src/modules/swap/pure/SwapButtons/index.tsx b/src/modules/swap/pure/SwapButtons/index.tsx
index cdcc26c131..a225e29457 100644
--- a/src/modules/swap/pure/SwapButtons/index.tsx
+++ b/src/modules/swap/pure/SwapButtons/index.tsx
@@ -32,8 +32,6 @@ export interface SwapButtonsContext {
   wrappedToken: Token
   handleSwap: HandleSwapCallback
   inputAmount: CurrencyAmount<Currency> | undefined
-  wrapUnwrapAmount: CurrencyAmount<Currency> | undefined
-  wrapInputError: string | undefined
   onWrapOrUnwrap: WrapUnwrapCallback | null
   onEthFlow: () => void
   openSwapConfirm: () => void
@@ -56,21 +54,6 @@ const swapButtonStateMap: { [key in SwapButtonState]: (props: SwapButtonsContext
       </Text>
     </ButtonError>
   ),
-  [SwapButtonState.WrapError]: (props: SwapButtonsContext) => (
-    <ButtonPrimary disabled={true} buttonSize={ButtonSize.BIG}>
-      {props.wrapInputError}
-    </ButtonPrimary>
-  ),
-  [SwapButtonState.ShouldWrapNativeToken]: (props: SwapButtonsContext) => (
-    <ButtonPrimary onClick={() => props.onWrapOrUnwrap?.()} buttonSize={ButtonSize.BIG}>
-      <Trans>Wrap</Trans>
-    </ButtonPrimary>
-  ),
-  [SwapButtonState.ShouldUnwrapNativeToken]: (props: SwapButtonsContext) => (
-    <ButtonPrimary onClick={() => props.onWrapOrUnwrap?.()} buttonSize={ButtonSize.BIG}>
-      <Trans>Unwrap</Trans>
-    </ButtonPrimary>
-  ),
   [SwapButtonState.SwapWithWrappedToken]: (props: SwapButtonsContext) => (
     <ButtonError buttonSize={ButtonSize.BIG} onClick={props.onEthFlow}>
       <styledEl.SwapButtonBox>
diff --git a/src/modules/swap/state/transactionConfirmAtom.ts b/src/modules/swap/state/transactionConfirmAtom.ts
deleted file mode 100644
index 4e76c5467a..0000000000
--- a/src/modules/swap/state/transactionConfirmAtom.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { atom } from 'jotai'
-
-import { ConfirmOperationType } from 'legacy/components/TransactionConfirmationModal'
-
-export interface TransactionConfirmState {
-  operationType: ConfirmOperationType
-  pendingText: string
-}
-
-export const transactionConfirmAtom = atom<TransactionConfirmState>({
-  operationType: ConfirmOperationType.UNWRAP_WETH,
-  pendingText: '',
-})
diff --git a/src/modules/tokens/hooks/useOnchainBalances.ts b/src/modules/tokens/hooks/useOnchainBalances.ts
index 43627f8201..cad2b6f077 100644
--- a/src/modules/tokens/hooks/useOnchainBalances.ts
+++ b/src/modules/tokens/hooks/useOnchainBalances.ts
@@ -28,13 +28,13 @@ export type OnchainAllowancesParams = OnchainAmountsParams & { spender?: string
 
 export function useOnchainBalances(params: OnchainBalancesParams): TokenAmountsResult {
   const { account } = params
-  const callParams = [account]
+  const callParams = useMemo(() => [account], [account])
   return useOnchainErc20Amounts('balanceOf', callParams, params)
 }
 
 export function useOnchainAllowances(params: OnchainAllowancesParams): TokenAmountsResult {
   const { account, spender } = params
-  const callParams = [account, spender]
+  const callParams = useMemo(() => [account, spender], [account, spender])
   return useOnchainErc20Amounts('allowance', callParams, params)
 }
 
diff --git a/src/modules/trade/containers/TradeWidget/index.tsx b/src/modules/trade/containers/TradeWidget/index.tsx
index 22c75d191f..15d04e2ded 100644
--- a/src/modules/trade/containers/TradeWidget/index.tsx
+++ b/src/modules/trade/containers/TradeWidget/index.tsx
@@ -140,7 +140,7 @@ export function TradeWidget(props: TradeWidgetProps) {
                   hasSeparatorLine={!compactView}
                   border={!compactView}
                   onSwitchTokens={throttledOnSwitchTokens}
-                  withRecipient={showRecipient}
+                  withRecipient={!isWrapOrUnwrap && showRecipient}
                   isLoading={isTradePriceUpdating}
                 />
               </styledEl.CurrencySeparatorBox>
@@ -165,7 +165,7 @@ export function TradeWidget(props: TradeWidgetProps) {
                   topLabel={outputCurrencyInfo.label}
                 />
               </div>
-              {showRecipient && (
+              {!isWrapOrUnwrap && showRecipient && (
                 <styledEl.StyledRemoveRecipient recipient={recipient || ''} onChangeRecipient={onChangeRecipient} />
               )}
 
diff --git a/src/modules/trade/hooks/useIsNativeInOrOut.ts b/src/modules/trade/hooks/useIsNativeInOrOut.ts
index c54bcebc69..57bf3b6efe 100644
--- a/src/modules/trade/hooks/useIsNativeInOrOut.ts
+++ b/src/modules/trade/hooks/useIsNativeInOrOut.ts
@@ -1,26 +1,11 @@
 import { useMemo } from 'react'
 
-import { SupportedChainId } from '@cowprotocol/cow-sdk'
-
-import { NATIVE_CURRENCY_BUY_TOKEN } from 'legacy/constants'
-import { supportedChainId } from 'legacy/utils/supportedChainId'
-
 import { useWalletInfo } from 'modules/wallet'
 
-import { doesTokenMatchSymbolOrAddress } from 'utils/doesTokenMatchSymbolOrAddress'
+import { getIsNativeToken } from 'utils/getIsNativeToken'
 
 import { useTradeState } from './useTradeState'
 
-function getIsNativeToken(chainId: SupportedChainId, tokenId: string): boolean {
-  const nativeToken = NATIVE_CURRENCY_BUY_TOKEN[chainId]
-
-  if (!supportedChainId(chainId)) {
-    return false
-  }
-
-  return doesTokenMatchSymbolOrAddress(nativeToken, tokenId)
-}
-
 export function useIsNativeIn(): boolean {
   const { chainId } = useWalletInfo()
   const { state } = useTradeState()
diff --git a/src/modules/trade/hooks/useIsWrapOrUnwrap.ts b/src/modules/trade/hooks/useIsWrapOrUnwrap.ts
index 641a0253ae..272d3930d4 100644
--- a/src/modules/trade/hooks/useIsWrapOrUnwrap.ts
+++ b/src/modules/trade/hooks/useIsWrapOrUnwrap.ts
@@ -1,13 +1,11 @@
 import { useMemo } from 'react'
 
-import { NATIVE_CURRENCY_BUY_TOKEN } from 'legacy/constants'
-import { WRAPPED_NATIVE_CURRENCY } from 'legacy/constants/tokens'
 import { supportedChainId } from 'legacy/utils/supportedChainId'
 
 import { useTradeState } from 'modules/trade/hooks/useTradeState'
 import { useWalletInfo } from 'modules/wallet'
 
-import { doesTokenMatchSymbolOrAddress } from 'utils/doesTokenMatchSymbolOrAddress'
+import { getIsWrapOrUnwrap } from 'utils/getIsWrapOrUnwrap'
 
 export function useIsWrapOrUnwrap(): boolean {
   const { chainId } = useWalletInfo()
@@ -17,17 +15,6 @@ export function useIsWrapOrUnwrap(): boolean {
   return useMemo(() => {
     if (!chainId || !supportedChainId(chainId)) return false
 
-    if (!inputCurrencyId || !outputCurrencyId) return false
-
-    const nativeToken = NATIVE_CURRENCY_BUY_TOKEN[chainId]
-    const wrappedToken = WRAPPED_NATIVE_CURRENCY[chainId]
-
-    const isNativeIn = doesTokenMatchSymbolOrAddress(nativeToken, inputCurrencyId)
-    const isNativeOut = doesTokenMatchSymbolOrAddress(nativeToken, outputCurrencyId)
-
-    const isWrappedIn = doesTokenMatchSymbolOrAddress(wrappedToken, inputCurrencyId)
-    const isWrappedOut = doesTokenMatchSymbolOrAddress(wrappedToken, outputCurrencyId)
-
-    return (isNativeIn && isWrappedOut) || (isNativeOut && isWrappedIn)
+    return getIsWrapOrUnwrap(chainId, inputCurrencyId, outputCurrencyId)
   }, [chainId, inputCurrencyId, outputCurrencyId])
 }
diff --git a/src/modules/trade/hooks/useTradePriceImpactParams.ts b/src/modules/trade/hooks/useTradePriceImpactParams.ts
index a07ec94e73..7dfa796638 100644
--- a/src/modules/trade/hooks/useTradePriceImpactParams.ts
+++ b/src/modules/trade/hooks/useTradePriceImpactParams.ts
@@ -3,13 +3,17 @@ import { useMemo } from 'react'
 import type { PriceImpactParams } from 'legacy/hooks/usePriceImpact'
 
 import { useDerivedTradeState } from './useDerivedTradeState'
+import { useIsWrapOrUnwrap } from './useIsWrapOrUnwrap'
+
+const emptyState = {
+  inputCurrencyAmount: null,
+  outputCurrencyAmount: null,
+}
 
 export function useTradePriceImpactParams(): PriceImpactParams {
   const { state } = useDerivedTradeState()
-  const { inputCurrencyAmount, outputCurrencyAmount } = state || {
-    inputCurrencyAmount: null,
-    outputCurrencyAmount: null,
-  }
+  const isWrapOrUnwrap = useIsWrapOrUnwrap()
+  const { inputCurrencyAmount, outputCurrencyAmount } = state || emptyState
 
   return useMemo(() => {
     const abTrade = {
@@ -28,8 +32,8 @@ export function useTradePriceImpactParams(): PriceImpactParams {
     return {
       abTrade,
       parsedAmounts,
-      isWrapping: false,
+      isWrapping: isWrapOrUnwrap,
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [inputCurrencyAmount?.quotient.toString(), outputCurrencyAmount?.quotient.toString()])
+  }, [inputCurrencyAmount?.quotient.toString(), outputCurrencyAmount?.quotient.toString(), isWrapOrUnwrap])
 }
diff --git a/src/modules/trade/hooks/useWrapNativeFlow.ts b/src/modules/trade/hooks/useWrapNativeFlow.ts
index c30550825a..d1ea61c023 100644
--- a/src/modules/trade/hooks/useWrapNativeFlow.ts
+++ b/src/modules/trade/hooks/useWrapNativeFlow.ts
@@ -20,15 +20,18 @@ import { useDerivedTradeState } from './useDerivedTradeState'
 
 import { wrapNativeStateAtom } from '../state/wrapNativeStateAtom'
 
-export function useWrapNativeFlow() {
-  const setWrapNativeState = useUpdateAtom(wrapNativeStateAtom)
+export function useWrapNativeFlow(): WrapUnwrapCallback {
   const derivedTradeState = useDerivedTradeState()
   const wrapCallback = useWrapNativeCallback(derivedTradeState.state?.inputCurrencyAmount)
 
-  return useCallback(() => {
-    setWrapNativeState({ isOpen: true })
-    wrapCallback?.()
-  }, [setWrapNativeState, wrapCallback])
+  return useCallback(
+    (params?: WrapUnwrapCallbackParams) => {
+      if (!wrapCallback) return Promise.resolve(null)
+
+      return wrapCallback(params)
+    },
+    [wrapCallback]
+  )
 }
 
 function useWrapNativeContext(amount: Nullish<CurrencyAmount<Currency>>): WrapUnwrapContext | null {
diff --git a/src/modules/trade/updaters/PriceImpactUpdater.tsx b/src/modules/trade/updaters/PriceImpactUpdater.tsx
index 2e9fc92d2d..baeaef7b89 100644
--- a/src/modules/trade/updaters/PriceImpactUpdater.tsx
+++ b/src/modules/trade/updaters/PriceImpactUpdater.tsx
@@ -1,7 +1,7 @@
 import { useUpdateAtom } from 'jotai/utils'
 import { useEffect } from 'react'
 
-import usePriceImpact from 'legacy/hooks/usePriceImpact'
+import { usePriceImpact } from 'legacy/hooks/usePriceImpact'
 
 import { useTradePriceImpactParams } from '../hooks/useTradePriceImpactParams'
 import { priceImpactAtom } from '../state/priceImpactAtom'
diff --git a/src/modules/tradeFormValidation/pure/TradeFormButtons/tradeButtonsMap.tsx b/src/modules/tradeFormValidation/pure/TradeFormButtons/tradeButtonsMap.tsx
index 1dac259d80..afc25d6d93 100644
--- a/src/modules/tradeFormValidation/pure/TradeFormButtons/tradeButtonsMap.tsx
+++ b/src/modules/tradeFormValidation/pure/TradeFormButtons/tradeButtonsMap.tsx
@@ -57,14 +57,11 @@ const unsupportedTokenButton = (context: TradeFormButtonContext) => {
 }
 
 export const tradeButtonsMap: Record<TradeFormValidation, ButtonErrorConfig | ButtonCallback> = {
-  [TradeFormValidation.WrapUnwrapAmountNotSet]: {
-    text: 'Enter an amount',
-  },
   [TradeFormValidation.WrapUnwrapFlow]: (context) => {
     const isNativeIn = !!context.derivedState.inputCurrency?.isNative
 
     return (
-      <TradeFormBlankButton onClick={context.wrapNativeFlow}>
+      <TradeFormBlankButton onClick={() => context.wrapNativeFlow()}>
         <Trans>{isNativeIn ? 'Wrap' : 'Unwrap'}</Trans>
       </TradeFormBlankButton>
     )
diff --git a/src/modules/tradeFormValidation/services/validateTradeForm.ts b/src/modules/tradeFormValidation/services/validateTradeForm.ts
index 0ec6ff9224..445ef5e67b 100644
--- a/src/modules/tradeFormValidation/services/validateTradeForm.ts
+++ b/src/modules/tradeFormValidation/services/validateTradeForm.ts
@@ -20,23 +20,13 @@ export function validateTradeForm(context: TradeFormValidationContext): TradeFor
     account,
   } = context
 
-  const { inputCurrency, outputCurrency, inputCurrencyAmount, inputCurrencyBalance, outputCurrencyAmount, recipient } =
-    derivedTradeState
+  const { inputCurrency, outputCurrency, inputCurrencyAmount, inputCurrencyBalance, recipient } = derivedTradeState
 
   const approvalRequired = approvalState === ApprovalState.NOT_APPROVED || approvalState === ApprovalState.PENDING
 
   const inputAmountIsNotSet = !inputCurrencyAmount || isFractionFalsy(inputCurrencyAmount)
-  const outputAmountIsNotSet = isFractionFalsy(outputCurrencyAmount)
 
-  if (isWrapUnwrap) {
-    if (inputAmountIsNotSet || outputAmountIsNotSet) {
-      return TradeFormValidation.WrapUnwrapAmountNotSet
-    }
-
-    return TradeFormValidation.WrapUnwrapFlow
-  }
-
-  if (tradeQuote.error) {
+  if (!isWrapUnwrap && tradeQuote.error) {
     return TradeFormValidation.QuoteErrors
   }
 
@@ -60,16 +50,18 @@ export function validateTradeForm(context: TradeFormValidationContext): TradeFor
     return TradeFormValidation.InputAmountNotSet
   }
 
-  if (recipient && !recipientEnsAddress && !isAddress(recipient)) {
-    return TradeFormValidation.RecipientInvalid
-  }
+  if (!isWrapUnwrap) {
+    if (recipient && !recipientEnsAddress && !isAddress(recipient)) {
+      return TradeFormValidation.RecipientInvalid
+    }
 
-  if (isSwapUnsupported) {
-    return TradeFormValidation.CurrencyNotSupported
-  }
+    if (isSwapUnsupported) {
+      return TradeFormValidation.CurrencyNotSupported
+    }
 
-  if (!tradeQuote.response) {
-    return TradeFormValidation.QuoteLoading
+    if (!tradeQuote.response) {
+      return TradeFormValidation.QuoteLoading
+    }
   }
 
   if (!inputCurrencyBalance) {
@@ -80,6 +72,10 @@ export function validateTradeForm(context: TradeFormValidationContext): TradeFor
     return TradeFormValidation.BalanceInsufficient
   }
 
+  if (isWrapUnwrap) {
+    return TradeFormValidation.WrapUnwrapFlow
+  }
+
   if (approvalRequired) {
     if (isTxBundlingEnabled) {
       if (isExpertMode) {
diff --git a/src/modules/tradeFormValidation/types.ts b/src/modules/tradeFormValidation/types.ts
index 919ed40c4f..4c3ed7a8de 100644
--- a/src/modules/tradeFormValidation/types.ts
+++ b/src/modules/tradeFormValidation/types.ts
@@ -5,7 +5,6 @@ import { TradeQuoteState } from 'modules/tradeQuote'
 
 export enum TradeFormValidation {
   // Wrap/unwrap
-  WrapUnwrapAmountNotSet,
   WrapUnwrapFlow,
 
   // Quote errors
diff --git a/src/utils/getIsNativeToken.ts b/src/utils/getIsNativeToken.ts
new file mode 100644
index 0000000000..8dd4e04224
--- /dev/null
+++ b/src/utils/getIsNativeToken.ts
@@ -0,0 +1,16 @@
+import { SupportedChainId } from '@cowprotocol/cow-sdk'
+
+import { NATIVE_CURRENCY_BUY_TOKEN } from 'legacy/constants'
+import { supportedChainId } from 'legacy/utils/supportedChainId'
+
+import { doesTokenMatchSymbolOrAddress } from './doesTokenMatchSymbolOrAddress'
+
+export function getIsNativeToken(chainId: SupportedChainId, tokenId: string): boolean {
+  const nativeToken = NATIVE_CURRENCY_BUY_TOKEN[chainId]
+
+  if (!supportedChainId(chainId)) {
+    return false
+  }
+
+  return doesTokenMatchSymbolOrAddress(nativeToken, tokenId)
+}
diff --git a/src/utils/getIsWrapOrUnwrap.ts b/src/utils/getIsWrapOrUnwrap.ts
new file mode 100644
index 0000000000..11305d728f
--- /dev/null
+++ b/src/utils/getIsWrapOrUnwrap.ts
@@ -0,0 +1,27 @@
+import { SupportedChainId } from '@cowprotocol/cow-sdk'
+
+import { NATIVE_CURRENCY_BUY_TOKEN } from 'legacy/constants'
+import { WRAPPED_NATIVE_CURRENCY } from 'legacy/constants/tokens'
+
+import { doesTokenMatchSymbolOrAddress } from './doesTokenMatchSymbolOrAddress'
+
+import { Nullish } from '../types'
+
+export function getIsWrapOrUnwrap(
+  chainId: SupportedChainId,
+  inputCurrencyId: Nullish<string>,
+  outputCurrencyId: Nullish<string>
+): boolean {
+  if (!inputCurrencyId || !outputCurrencyId) return false
+
+  const nativeToken = NATIVE_CURRENCY_BUY_TOKEN[chainId]
+  const wrappedToken = WRAPPED_NATIVE_CURRENCY[chainId]
+
+  const isNativeIn = doesTokenMatchSymbolOrAddress(nativeToken, inputCurrencyId)
+  const isNativeOut = doesTokenMatchSymbolOrAddress(nativeToken, outputCurrencyId)
+
+  const isWrappedIn = doesTokenMatchSymbolOrAddress(wrappedToken, inputCurrencyId)
+  const isWrappedOut = doesTokenMatchSymbolOrAddress(wrappedToken, outputCurrencyId)
+
+  return (isNativeIn && isWrappedOut) || (isNativeOut && isWrappedIn)
+}

From 8843d73d721cba56d14b04b7e98f21e5026c287b Mon Sep 17 00:00:00 2001
From: Leandro <alfetopito@users.noreply.github.com>
Date: Mon, 10 Jul 2023 00:29:40 -0700
Subject: [PATCH 65/67] fix(surplus-pending-swap-buy-receipt): fix receipt for
 pending buy swap orders (#2811)

---
 src/utils/orderUtils/getOrderSurplus.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/utils/orderUtils/getOrderSurplus.ts b/src/utils/orderUtils/getOrderSurplus.ts
index d6f5ac0367..77f6270ec5 100644
--- a/src/utils/orderUtils/getOrderSurplus.ts
+++ b/src/utils/orderUtils/getOrderSurplus.ts
@@ -1,5 +1,6 @@
 // Util functions that only pertain to/deal with operator API related stuff
 import BigNumber from 'bignumber.js'
+import JSBI from 'jsbi'
 
 import { ZERO_BIG_NUMBER } from 'legacy/constants'
 import { Order } from 'legacy/state/orders/actions'
@@ -145,7 +146,7 @@ export function getOrderSurplus(order: Order): Surplus {
   // `executedSellAmount` already has `executedFeeAmount` discounted
   const { executedBuyAmount, executedSellAmount } = getOrderExecutedAmounts(order)
 
-  if (!executedBuyAmount || !executedSellAmount) {
+  if (JSBI.EQ(executedBuyAmount, 0) || JSBI.EQ(executedSellAmount, 0)) {
     return ZERO_SURPLUS
   }
 

From 5980e641dd9f1bf31e18732eac5eff3158724845 Mon Sep 17 00:00:00 2001
From: Leandro <alfetopito@users.noreply.github.com>
Date: Fri, 7 Jul 2023 06:04:20 -0700
Subject: [PATCH 66/67] feat(twap): review button label on limit (#2807)

* feat: use different button text defaults when expert mode or not

* feat: limit order confirm button text changed to `Place limit order`

* feat: update TWAP confirmation modal button text to `Place TWAP order`
---
 .../containers/LimitOrdersConfirmModal/index.tsx    |  4 +++-
 .../limitOrders/containers/TradeButtons/index.tsx   | 13 +++++++++----
 src/modules/trade/pure/TradeConfirmation/index.tsx  |  2 +-
 .../twap/containers/TwapConfirmModal/index.tsx      |  1 +
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/modules/limitOrders/containers/LimitOrdersConfirmModal/index.tsx b/src/modules/limitOrders/containers/LimitOrdersConfirmModal/index.tsx
index bb40ab4381..a6df845c48 100644
--- a/src/modules/limitOrders/containers/LimitOrdersConfirmModal/index.tsx
+++ b/src/modules/limitOrders/containers/LimitOrdersConfirmModal/index.tsx
@@ -59,7 +59,9 @@ export function LimitOrdersConfirmModal(props: LimitOrdersConfirmModalProps) {
       <TokenSymbol token={inputAmount?.currency.wrapped} length={6} />
       &nbsp;& Limit order)
     </>
-  ) : undefined
+  ) : (
+    'Place limit order'
+  )
 
   return (
     <>
diff --git a/src/modules/limitOrders/containers/TradeButtons/index.tsx b/src/modules/limitOrders/containers/TradeButtons/index.tsx
index 3396890436..45d899e4ff 100644
--- a/src/modules/limitOrders/containers/TradeButtons/index.tsx
+++ b/src/modules/limitOrders/containers/TradeButtons/index.tsx
@@ -11,16 +11,19 @@ import { TradeFlowContext } from 'modules/limitOrders/services/types'
 import { limitOrdersSettingsAtom } from 'modules/limitOrders/state/limitOrdersSettingsAtom'
 import { useTradeConfirmActions } from 'modules/trade'
 import {
+  TradeFormBlankButton,
   TradeFormButtons,
   useGetTradeFormValidation,
   useTradeFormButtonContext,
-  TradeFormBlankButton,
 } from 'modules/tradeFormValidation'
 
 import { limitOrdersTradeButtonsMap } from './limitOrdersTradeButtonsMap'
 
 import { useLimitOrdersFormState } from '../../hooks/useLimitOrdersFormState'
 
+const DO_TRADE_TEXT = 'Place limit order'
+const CONFIRM_TEXT = 'Review limit order'
+
 export interface TradeButtonsProps {
   tradeContext: TradeFlowContext | null
   priceImpact: PriceImpact
@@ -39,7 +42,9 @@ export function TradeButtons(props: TradeButtonsProps) {
   const confirmTrade = tradeConfirmActions.onOpen
   const isExpertMode = settingsState.expertMode
 
-  const tradeFormButtonContext = useTradeFormButtonContext('Limit order', { doTrade: handleTrade, confirmTrade })
+  const defaultText = isExpertMode ? DO_TRADE_TEXT : CONFIRM_TEXT
+
+  const tradeFormButtonContext = useTradeFormButtonContext(defaultText, { doTrade: handleTrade, confirmTrade })
 
   if (!tradeFormButtonContext) return null
 
@@ -58,8 +63,8 @@ export function TradeButtons(props: TradeButtonsProps) {
 
   return (
     <TradeFormButtons
-      doTradeText="Place limit order"
-      confirmText="Review limit order"
+      doTradeText={DO_TRADE_TEXT}
+      confirmText={CONFIRM_TEXT}
       validation={primaryFormValidation}
       context={tradeFormButtonContext}
       isExpertMode={isExpertMode}
diff --git a/src/modules/trade/pure/TradeConfirmation/index.tsx b/src/modules/trade/pure/TradeConfirmation/index.tsx
index 8870143e2d..8458312344 100644
--- a/src/modules/trade/pure/TradeConfirmation/index.tsx
+++ b/src/modules/trade/pure/TradeConfirmation/index.tsx
@@ -22,7 +22,7 @@ export interface TradeConfirmationProps {
   isConfirmDisabled: boolean
   priceImpact: PriceImpact
   title: JSX.Element | string
-  buttonText?: JSX.Element
+  buttonText?: React.ReactNode
   children?: JSX.Element
 }
 
diff --git a/src/modules/twap/containers/TwapConfirmModal/index.tsx b/src/modules/twap/containers/TwapConfirmModal/index.tsx
index afcdcc76f3..c0280ed1ec 100644
--- a/src/modules/twap/containers/TwapConfirmModal/index.tsx
+++ b/src/modules/twap/containers/TwapConfirmModal/index.tsx
@@ -79,6 +79,7 @@ export function TwapConfirmModal({ fallbackHandlerIsNotSet }: TwapConfirmModalPr
         onDismiss={tradeConfirmActions.onDismiss}
         isConfirmDisabled={isConfirmDisabled}
         priceImpact={priceImpact}
+        buttonText={'Place TWAP order'}
       >
         <>
           <TradeBasicConfirmDetails

From 704c44417c6c1e54018e43e70622250d1edc5a92 Mon Sep 17 00:00:00 2001
From: Leandro <alfetopito@users.noreply.github.com>
Date: Mon, 10 Jul 2023 00:28:30 -0700
Subject: [PATCH 67/67] feat(filled-tooltip): update filled tooltip (#2814)

---
 src/modules/ordersTable/pure/ReceiptModal/index.tsx | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/modules/ordersTable/pure/ReceiptModal/index.tsx b/src/modules/ordersTable/pure/ReceiptModal/index.tsx
index d1dfce76e3..8b20d368fd 100644
--- a/src/modules/ordersTable/pure/ReceiptModal/index.tsx
+++ b/src/modules/ordersTable/pure/ReceiptModal/index.tsx
@@ -43,8 +43,14 @@ const tooltips: { [key: string]: string | JSX.Element } = {
   EXECUTION_PRICE: 'An order’s actual execution price will vary based on the market price and network fees.',
   EXECUTES_AT:
     'Fees (incl. gas) are covered by filling your order when the market price is better than your limit price.',
-  FILLED:
-    "CoW Swap doesn't currently support partial fills. Your order will either be filled completely or not at all.",
+  FILLED: (
+    <span>
+      How much of the order has been filled.
+      <br />
+      Market orders are always <i>Fill or kill</i>, while limit orders are by default <i>Partially fillable</i>, but can
+      also be changed to <i>Fill or kill</i> through your order settings.
+    </span>
+  ),
   SURPLUS: 'The amount of extra tokens you get on top of your limit price.',
   FEE: 'CoW Protocol covers the fees by executing your order at a slightly better price than your limit price.',
   CREATED: 'Your order was created on this date & time. It will remain open until it expires or is filled.',