diff --git a/app/ZetaChainContext.tsx b/app/ZetaChainContext.tsx
deleted file mode 100644
index 1332201..0000000
--- a/app/ZetaChainContext.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import React, { ReactNode, createContext, useContext, useState } from "react"
-import { ZetaChainClient } from "@zetachain/toolkit/client"
-
-const ZetaChainContext = createContext<any>(undefined!)
-
-interface ZetaChainProviderProps {
-  children: ReactNode
-}
-
-export function ZetaChainProvider({ children }: ZetaChainProviderProps) {
-  const [client] = useState(
-    () =>
-      new ZetaChainClient({
-        network: "testnet",
-        chains: {
-          zeta_testnet: {
-            api: [
-              {
-                url: `https://zetachain-athens.g.allthatnode.com/archive/evm/${process.env.NEXT_PUBLIC_ATN_KEY}`,
-                type: "evm",
-              },
-            ],
-          },
-        },
-      })
-  )
-
-  return (
-    <ZetaChainContext.Provider value={{ client }}>
-      {children}
-    </ZetaChainContext.Provider>
-  )
-}
-
-export function useZetaChain(): any {
-  const context = useContext(ZetaChainContext)
-  if (context === undefined) {
-    throw new Error("useZetaChain must be used within a ZetaChainProvider")
-  }
-  return context
-}
diff --git a/app/index.tsx b/app/index.tsx
index c7283c9..66533f9 100644
--- a/app/index.tsx
+++ b/app/index.tsx
@@ -1,431 +1,29 @@
 "use client"
 
-import { EvmPriceServiceConnection } from "@pythnetwork/pyth-evm-js"
+import { AppProvider } from "@/context/AppContext"
 
-import "@/styles/globals.css"
-import { createContext, useCallback, useEffect, useState } from "react"
-import { getEndpoints } from "@zetachain/networks/dist/src/getEndpoints"
-import EventEmitter from "eventemitter3"
-// @ts-ignore
-import Cookies from "js-cookie"
-import debounce from "lodash/debounce"
-import { useAccount } from "wagmi"
-
-import { hexToBech32Address } from "@/lib/hexToBech32Address"
 import { Toaster } from "@/components/ui/toaster"
-import { useToast } from "@/components/ui/use-toast"
 import { SiteHeader } from "@/components/site-header"
 import { ThemeProvider } from "@/components/theme-provider"
 
-import { useZetaChain } from "./ZetaChainContext"
 import { NFTProvider } from "./nft/useNFT"
 
 interface RootLayoutProps {
   children: React.ReactNode
 }
 
-export const AppContext = createContext<any>(null)
-
 export default function Index({ children }: RootLayoutProps) {
-  const { client } = useZetaChain()
-
-  const [balances, setBalances] = useState<any>([])
-  const [balancesLoading, setBalancesLoading] = useState(true)
-  const [balancesRefreshing, setBalancesRefreshing] = useState(false)
-  const [bitcoinAddress, setBitcoinAddress] = useState("")
-  const [fees, setFees] = useState<any>([])
-  const [pools, setPools] = useState<any>([])
-  const [poolsLoading, setPoolsLoading] = useState(false)
-  const [validators, setValidators] = useState<any>([])
-  const [validatorsLoading, setValidatorsLoading] = useState(false)
-  const [stakingDelegations, setStakingDelegations] = useState<any>([])
-  const [stakingRewards, setStakingRewards] = useState<any>([])
-  const [unbondingDelegations, setUnbondingDelegations] = useState<any>([])
-  const [observers, setObservers] = useState<any>([])
-  const [prices, setPrices] = useState<any>([])
-  const { address, isConnected } = useAccount()
-  const { toast } = useToast()
-
-  const fetchObservers = useCallback(
-    debounce(async () => {
-      try {
-        const api = getEndpoints("cosmos-http", "zeta_testnet")[0]?.url
-        const url = `${api}/zeta-chain/observer/nodeAccount`
-        const response = await fetch(url)
-        const data = await response.json()
-        setObservers(data.NodeAccount)
-      } catch (e) {
-        console.error(e)
-      }
-    }, 500),
-    []
-  )
-
-  const fetchUnbondingDelegations = useCallback(
-    debounce(async () => {
-      try {
-        if (!isConnected) {
-          return setUnbondingDelegations([])
-        }
-        const api = getEndpoints("cosmos-http", "zeta_testnet")[0]?.url
-        const addr = hexToBech32Address(address as any, "zeta")
-        const url = `${api}/cosmos/staking/v1beta1/delegators/${addr}/unbonding_delegations`
-        const response = await fetch(url)
-        const data = await response.json()
-        setUnbondingDelegations(data.unbonding_responses)
-      } catch (e) {
-        console.error(e)
-      }
-    }, 500),
-    [address, isConnected]
-  )
-
-  const connectBitcoin = async () => {
-    const w = window as any
-    console.log("connect bitcoin")
-    if ("xfi" in w && w.xfi?.bitcoin) {
-      w.xfi.bitcoin.changeNetwork("testnet")
-      const btc = (await w.xfi.bitcoin.getAccounts())[0]
-      await setBitcoinAddress(btc)
-      // fetchBalances(true, btc)
-    }
-  }
-
-  const fetchStakingDelegations = useCallback(
-    debounce(async () => {
-      try {
-        if (!isConnected) {
-          return setStakingDelegations([])
-        }
-        const api = getEndpoints("cosmos-http", "zeta_testnet")[0]?.url
-        const addr = hexToBech32Address(address as any, "zeta")
-        const url = `${api}/cosmos/staking/v1beta1/delegations/${addr}`
-        const response = await fetch(url)
-        const data = await response.json()
-        setStakingDelegations(data.delegation_responses)
-      } catch (e) {
-        console.error(e)
-      }
-    }, 500),
-    [address, isConnected]
-  )
-
-  const fetchStakingRewards = useCallback(
-    debounce(async () => {
-      try {
-        if (!isConnected) {
-          return setStakingRewards([])
-        }
-        const api = getEndpoints("cosmos-http", "zeta_testnet")[0]?.url
-        const addr = hexToBech32Address(address as any, "zeta")
-        const url = `${api}/cosmos/distribution/v1beta1/delegators/${addr}/rewards`
-        const response = await fetch(url)
-        const data = await response.json()
-        setStakingRewards(data.rewards)
-      } catch (e) {
-        console.error(e)
-      }
-    }, 500),
-    [address, isConnected]
-  )
-
-  const fetchValidators = useCallback(
-    debounce(async () => {
-      setValidatorsLoading(true)
-      let allValidators: any[] = []
-      let nextKey: any = null
-
-      try {
-        if (!isConnected) {
-          setValidatorsLoading(false)
-          setValidators([])
-        }
-        const api = getEndpoints("cosmos-http", "zeta_testnet")[0]?.url
-
-        const fetchBonded = async () => {
-          const response = await fetch(`${api}/cosmos/staking/v1beta1/pool`)
-          const data = await response.json()
-          return data
-        }
-
-        const fetchPage = async (key: string) => {
-          const endpoint = "/cosmos/staking/v1beta1/validators"
-          const query = `pagination.key=${encodeURIComponent(key)}`
-          const url = `${api}${endpoint}?${key && query}`
-
-          const response = await fetch(url)
-          const data = await response.json()
-
-          allValidators = allValidators.concat(data.validators)
-
-          if (data.pagination && data.pagination.next_key) {
-            await fetchPage(data.pagination.next_key)
-          }
-        }
-        const pool = (await fetchBonded())?.pool
-        const tokens = parseInt(pool.bonded_tokens)
-        await fetchPage(nextKey)
-        allValidators = allValidators.map((v) => {
-          return {
-            ...v,
-            voting_power: tokens ? (parseInt(v.tokens) / tokens) * 100 : 0,
-          }
-        })
-      } catch (e) {
-        console.error(e)
-      } finally {
-        setValidators(allValidators)
-        setValidatorsLoading(false)
-      }
-    }, 500),
-    [address, isConnected]
-  )
-
-  const fetchBalances = useCallback(
-    debounce(async (refresh: Boolean = false, btc: any = null) => {
-      if (refresh) setBalancesRefreshing(true)
-      if (balances.length === 0) setBalancesLoading(true)
-      try {
-        if (!isConnected) {
-          return setBalances([])
-        }
-        const b = await client.getBalances({
-          evmAddress: address,
-          btcAddress: btc,
-        })
-        setBalances(b)
-      } catch (e) {
-        console.log(e)
-      } finally {
-        setBalancesRefreshing(false)
-        setBalancesLoading(false)
-      }
-    }, 500),
-    [isConnected, address]
-  )
-
-  const fetchFeesList = useCallback(
-    debounce(async () => {
-      try {
-        if (!isConnected) {
-          return setFees([])
-        }
-        setFees(await client.getFees(500000))
-      } catch (e) {
-        console.log(e)
-      }
-    }, 500),
-    []
-  )
-
-  const fetchPools = useCallback(
-    debounce(async () => {
-      setPoolsLoading(true)
-      try {
-        setPools(await client.getPools())
-      } catch (e) {
-        console.log(e)
-      } finally {
-        setPoolsLoading(false)
-      }
-    }, 500),
-    []
-  )
-
-  useEffect(() => {
-    fetchBalances(true)
-    fetchFeesList()
-    fetchStakingDelegations()
-    fetchPrices()
-  }, [isConnected, address])
-
-  const fetchPrices = useCallback(
-    debounce(async () => {
-      let priceIds: any = []
-      const api = getEndpoints("cosmos-http", "zeta_testnet")[0]?.url
-
-      const zetaChainUrl = `${api}/zeta-chain/fungible/foreign_coins`
-      const pythNetworkUrl = "https://benchmarks.pyth.network/v1/price_feeds/"
-
-      try {
-        const zetaResponse = await fetch(zetaChainUrl)
-        const zetaData = await zetaResponse.json()
-        const foreignCoins = zetaData.foreignCoins
-        const symbolsFromZeta = foreignCoins.map((coin: any) =>
-          coin.symbol.replace(/^[tg]/, "")
-        )
-
-        const pythResponse = await fetch(pythNetworkUrl)
-        const pythData = await pythResponse.json()
-        const priceFeeds = pythData
-
-        priceIds = priceFeeds
-          .filter((feed: any) => {
-            const base = symbolsFromZeta.includes(feed.attributes.base)
-            const quote = feed.attributes.quote_currency === "USD"
-            return base && quote
-          })
-          .map((feed: any) => ({
-            symbol: feed.attributes.base,
-            id: feed.id,
-          }))
-      } catch (error) {
-        console.error("Error fetching or processing data:", error)
-        return []
-      }
-      const connection = new EvmPriceServiceConnection(
-        "https://hermes.pyth.network"
-      )
-
-      const priceFeeds = await connection.getLatestPriceFeeds(
-        priceIds.map((p: any) => p.id)
-      )
-
-      setPrices(
-        priceFeeds?.map((p: any) => {
-          const pr = p.getPriceNoOlderThan(60)
-          return {
-            id: p.id,
-            symbol: priceIds.find((i: any) => i.id === p.id)?.symbol,
-            price: parseInt(pr.price) * 10 ** pr.expo,
-          }
-        })
-      )
-    }, 500),
-    []
-  )
-
-  const [inbounds, setInbounds] = useState<any>([])
-  const [cctxs, setCCTXs] = useState<any>([])
-
-  const updateCCTX = (updatedItem: any) => {
-    setCCTXs((prevItems: any) => {
-      const index = prevItems.findIndex(
-        (item: any) => item.inboundHash === updatedItem.inboundHash
-      )
-
-      if (index === -1) return prevItems
-
-      const newItems = [...prevItems]
-      newItems[index] = {
-        ...newItems[index],
-        ...updatedItem,
-      }
-
-      return newItems
-    })
-  }
-
-  useEffect(() => {
-    const cctxList = cctxs.map((c: any) => c.inboundHash)
-    for (let i of inbounds) {
-      if (!cctxList.includes(i.inboundHash)) {
-        const emitter = new EventEmitter()
-        emitter
-          .on("search-add", ({ text }) => {
-            updateCCTX({
-              inboundHash: i.inboundHash,
-              progress: text,
-              status: "searching",
-            })
-          })
-          .on("add", ({ text }) => {
-            updateCCTX({
-              inboundHash: i.inboundHash,
-              progress: text,
-              status: "searching",
-            })
-          })
-          .on("succeed", ({ text }) => {
-            updateCCTX({
-              inboundHash: i.inboundHash,
-              progress: text,
-              status: "succeed",
-            })
-          })
-          .on("fail", ({ text }) => {
-            updateCCTX({
-              inboundHash: i.inboundHash,
-              progress: text,
-              status: "failed",
-            })
-          })
-          .on("mined-success", (value) => {
-            updateCCTX({
-              inboundHash: i.inboundHash,
-              status: "mined-success",
-              ...value,
-            })
-          })
-          .on("mined-fail", (value) => {
-            updateCCTX({
-              inboundHash: i.inboundHash,
-              status: "mined-fail",
-              ...value,
-            })
-          })
-
-        client.trackCCTX(i.inboundHash, false, emitter)
-        setCCTXs([...cctxs, { inboundHash: i.inboundHash, desc: i.desc }])
-      }
-    }
-  }, [inbounds])
-
-  useEffect(() => {
-    if (!Cookies.get("firstTimeVisit")) {
-      toast({
-        title: "Welcome to ZetaChain Example App",
-        description: "This is a testnet. Please do not use real funds.",
-        duration: 60000,
-      })
-      Cookies.set("firstTimeVisit", "true", { expires: 7 })
-    }
-  }, [])
-
   return (
-    <>
-      <AppContext.Provider
-        value={{
-          cctxs,
-          inbounds,
-          balances,
-          bitcoinAddress,
-          balancesLoading,
-          balancesRefreshing,
-          fees,
-          connectBitcoin,
-          pools,
-          poolsLoading,
-          validators,
-          fetchValidators,
-          validatorsLoading,
-          stakingDelegations,
-          stakingRewards,
-          setCCTXs,
-          setInbounds,
-          setBitcoinAddress,
-          setBalances,
-          fetchPools,
-          fetchBalances,
-          fetchStakingDelegations,
-          fetchStakingRewards,
-          unbondingDelegations,
-          fetchUnbondingDelegations,
-          prices,
-          fetchObservers,
-          observers,
-        }}
-      >
-        <ThemeProvider attribute="class" defaultTheme="light" enableSystem>
-          <NFTProvider>
-            <div className="relative flex min-h-screen flex-col">
-              <SiteHeader />
-              <section className="container px-4 mt-4">{children}</section>
-            </div>
-            <Toaster />
-          </NFTProvider>
-        </ThemeProvider>
-      </AppContext.Provider>
-    </>
+    <AppProvider>
+      <ThemeProvider attribute="class" defaultTheme="light" enableSystem>
+        <NFTProvider>
+          <div className="relative flex min-h-screen flex-col">
+            <SiteHeader />
+            <section className="container px-4 mt-4">{children}</section>
+          </div>
+          <Toaster />
+        </NFTProvider>
+      </ThemeProvider>
+    </AppProvider>
   )
 }
diff --git a/app/layout.tsx b/app/layout.tsx
index 16a292c..a70a960 100644
--- a/app/layout.tsx
+++ b/app/layout.tsx
@@ -1,6 +1,7 @@
 "use client"
 
 import "@/styles/globals.css"
+import { Inter as FontSans } from "next/font/google"
 import {
   injectedWallet,
   metaMaskWallet,
@@ -8,23 +9,16 @@ import {
   xdefiWallet,
 } from "@rainbow-me/rainbowkit/wallets"
 
-import { fontSans } from "@/lib/fonts"
-import { cn } from "@/lib/utils"
+import { ZetaChainProvider } from "@/hooks/useZetaChainClient"
 import Index from "@/app/index"
 
-import { ZetaChainProvider } from "./ZetaChainContext"
 import "@rainbow-me/rainbowkit/styles.css"
 import {
   RainbowKitProvider,
   connectorsForWallets,
 } from "@rainbow-me/rainbowkit"
 import { WagmiConfig, configureChains, createConfig } from "wagmi"
-import {
-  bscTestnet,
-  polygonMumbai,
-  sepolia,
-  zetachainAthensTestnet,
-} from "wagmi/chains"
+import { bscTestnet, sepolia, zetachainAthensTestnet } from "wagmi/chains"
 import { publicProvider } from "wagmi/providers/public"
 
 interface RootLayoutProps {
@@ -34,7 +28,6 @@ interface RootLayoutProps {
 const { chains, publicClient, webSocketPublicClient } = configureChains(
   [
     sepolia,
-    polygonMumbai,
     bscTestnet,
     {
       ...zetachainAthensTestnet,
@@ -63,26 +56,26 @@ const wagmiConfig = createConfig({
   webSocketPublicClient,
 })
 
+const fontSans = FontSans({
+  subsets: ["latin"],
+  variable: "--font-sans",
+})
+
 export default function RootLayout({ children }: RootLayoutProps) {
   return (
-    <>
-      <html lang="en" suppressHydrationWarning>
-        <head />
-        <body
-          className={cn(
-            "min-h-screen bg-background font-sans antialiased",
-            fontSans.variable
-          )}
-        >
-          <WagmiConfig config={wagmiConfig}>
-            <RainbowKitProvider chains={chains}>
-              <ZetaChainProvider>
-                <Index>{children}</Index>
-              </ZetaChainProvider>
-            </RainbowKitProvider>
-          </WagmiConfig>
-        </body>
-      </html>
-    </>
+    <html lang="en" suppressHydrationWarning>
+      <head />
+      <body
+        className={`min-h-screen bg-background font-sans antialiased ${fontSans.variable}`}
+      >
+        <WagmiConfig config={wagmiConfig}>
+          <RainbowKitProvider chains={chains}>
+            <ZetaChainProvider>
+              <Index>{children}</Index>
+            </ZetaChainProvider>
+          </RainbowKitProvider>
+        </WagmiConfig>
+      </body>
+    </html>
   )
 }
diff --git a/app/messaging/page.tsx b/app/messaging/page.tsx
index 76f6865..91daf2d 100644
--- a/app/messaging/page.tsx
+++ b/app/messaging/page.tsx
@@ -2,6 +2,7 @@
 
 import { useCallback, useContext, useEffect, useState } from "react"
 import Link from "next/link"
+import { useAppContext } from "@/context/AppContext"
 import UniswapV2Factory from "@uniswap/v2-periphery/build/IUniswapV2Router02.json"
 import Quoter from "@uniswap/v3-periphery/artifacts/contracts/lens/Quoter.sol/Quoter.json"
 import { getExplorers } from "@zetachain/networks"
@@ -20,8 +21,7 @@ import {
   useWaitForTransaction,
 } from "wagmi"
 
-import { useEthersSigner } from "@/lib/ethers"
-import { cn } from "@/lib/utils"
+import { useEthersSigner } from "@/hooks/useEthersSigner"
 import { Alert, AlertDescription } from "@/components/ui/alert"
 import { Button } from "@/components/ui/button"
 import { Card } from "@/components/ui/card"
@@ -36,7 +36,6 @@ import {
   SelectTrigger,
   SelectValue,
 } from "@/components/ui/select"
-import { AppContext } from "@/app/index"
 
 const contracts: any = {
   goerli_testnet: "0x122F9Cca5121F23b74333D5FBd0c5D9B413bc002",
@@ -73,7 +72,7 @@ const MessagingPage = () => {
       (networks as any)[destinationNetwork]?.chain_id ?? null
     )
   }, [destinationNetwork])
-  const { inbounds, setInbounds, fees } = useContext(AppContext)
+  const { inbounds, setInbounds, fees } = useAppContext()
 
   const {
     config,
@@ -347,7 +346,7 @@ const MessagingPage = () => {
                 disabled
                 checked={!!destinationNetwork}
               />
-              <span className={cn(!!destinationNetwork && "line-through")}>
+              <span className={`${!!destinationNetwork && "line-through"}`}>
                 First, select the destination network
               </span>
             </li>
@@ -361,13 +360,13 @@ const MessagingPage = () => {
             )}
             <li className="flex">
               <Checkbox className="mr-2 mt-1" disabled checked={!!message} />
-              <span className={cn(!!message && "line-through")}>
+              <span className={`${!!message && "line-through"}`}>
                 Next, write a message in the input field
               </span>
             </li>
             <li className="flex">
               <Checkbox className="mr-2 mt-1" disabled checked={completed} />
-              <span className={cn(completed && "line-through")}>
+              <span className={`${completed && "line-through"}`}>
                 Finally, click Send message and confirm in your wallet
               </span>
             </li>
diff --git a/app/nft/burn.ts b/app/nft/burn.ts
index fbd2e0c..0d8c3e8 100644
--- a/app/nft/burn.ts
+++ b/app/nft/burn.ts
@@ -1,10 +1,10 @@
 import { useContext } from "react"
+import { useAppContext } from "@/context/AppContext"
 import { abi } from "@zetachain/example-contracts/abi/omnichain/NFT.sol/NFT.json"
 import { ethers } from "ethers"
 import { useAccount } from "wagmi"
 
-import { useEthersSigner } from "@/lib/ethers"
-import { AppContext } from "@/app/index"
+import { useEthersSigner } from "@/hooks/useEthersSigner"
 
 import { useFetchNFTs } from "./fetchNFTs"
 import { useNFT } from "./useNFT"
@@ -16,7 +16,7 @@ export const useBurn = () => {
     setAssetsBurned,
     omnichainContract,
   } = useNFT()
-  const { setInbounds, inbounds } = useContext(AppContext)
+  const { setInbounds, inbounds } = useAppContext()
   const { address } = useAccount()
   const signer = useEthersSigner()
   const { fetchNFTs } = useFetchNFTs()
diff --git a/app/nft/fetchNFTs.ts b/app/nft/fetchNFTs.ts
index 1ceb9f2..ca21610 100644
--- a/app/nft/fetchNFTs.ts
+++ b/app/nft/fetchNFTs.ts
@@ -59,7 +59,6 @@ export const useFetchNFTs = () => {
   const { address } = useAccount()
 
   const fetchNFTs = async () => {
-    console.log("Fetching NFTs...")
     setAssetsReloading(true)
     try {
       let ownedNFTs: any = []
@@ -96,7 +95,7 @@ export const useFetchNFTs = () => {
       assets.sort((a: any, b: any) => parseInt(b.id) - parseInt(a.id))
       setAssets(assets)
     } catch (e) {
-      console.log(e)
+      console.error(e)
     } finally {
       setAssetsReloading(false)
     }
diff --git a/app/nft/mint.ts b/app/nft/mint.ts
index c3035e8..10346f2 100644
--- a/app/nft/mint.ts
+++ b/app/nft/mint.ts
@@ -1,12 +1,12 @@
 import { useContext } from "react"
+import { useAppContext } from "@/context/AppContext"
 import { networks } from "@zetachain/networks"
 import { getAddress } from "@zetachain/protocol-contracts"
 import { prepareData } from "@zetachain/toolkit/client"
 import { parseEther } from "viem"
 import { useAccount } from "wagmi"
 
-import { useEthersSigner } from "@/lib/ethers"
-import { AppContext } from "@/app/index"
+import { useEthersSigner } from "@/hooks/useEthersSigner"
 
 import { useNFT } from "./useNFT"
 
@@ -14,7 +14,7 @@ export const useMint = () => {
   const { amount, setAmount, setMintingInProgress, omnichainContract } =
     useNFT()
   const { bitcoinAddress, setInbounds, inbounds, connectBitcoin } =
-    useContext(AppContext)
+    useAppContext()
   const { address } = useAccount()
   const signer = useEthersSigner()
 
diff --git a/app/nft/page.tsx b/app/nft/page.tsx
index 0fbca11..ce64953 100644
--- a/app/nft/page.tsx
+++ b/app/nft/page.tsx
@@ -1,6 +1,7 @@
 "use client"
 
 import { useContext, useEffect } from "react"
+import { useAppContext } from "@/context/AppContext"
 import { AnimatePresence, motion } from "framer-motion"
 import { debounce } from "lodash"
 import { Flame, Loader, RefreshCw, Send, Sparkles } from "lucide-react"
@@ -21,7 +22,6 @@ import {
   SelectTrigger,
   SelectValue,
 } from "@/components/ui/select"
-import { AppContext } from "@/app/index"
 
 import { useBurn } from "./burn"
 import { useFetchNFTs } from "./fetchNFTs"
@@ -44,7 +44,7 @@ const NFTPage = () => {
     setRecipient,
     foreignCoins,
   } = useNFT()
-  const { cctxs } = useContext(AppContext)
+  const { cctxs } = useAppContext()
   const { switchNetwork } = useSwitchNetwork()
   const { chain } = useNetwork()
   const { transfer } = useTransfer()
diff --git a/app/nft/transfer.ts b/app/nft/transfer.ts
index 91972b2..c2f1a9f 100644
--- a/app/nft/transfer.ts
+++ b/app/nft/transfer.ts
@@ -2,7 +2,7 @@ import { abi } from "@zetachain/example-contracts/abi/omnichain/NFT.sol/NFT.json
 import { ethers } from "ethers"
 import { useAccount } from "wagmi"
 
-import { useEthersSigner } from "@/lib/ethers"
+import { useEthersSigner } from "@/hooks/useEthersSigner"
 
 import { useFetchNFTs } from "./fetchNFTs"
 import { useNFT } from "./useNFT"
diff --git a/app/page.tsx b/app/page.tsx
index 79bd04d..6a0c108 100644
--- a/app/page.tsx
+++ b/app/page.tsx
@@ -1,30 +1,15 @@
 "use client"
 
-import { useContext, useEffect, useState } from "react"
-import Link from "next/link"
-import {
-  ArrowBigUp,
-  ChevronDown,
-  ChevronUp,
-  MessageCircle,
-  RefreshCw,
-} from "lucide-react"
-import { formatUnits } from "viem"
+import { useEffect, useState } from "react"
+import { useAppContext } from "@/context/AppContext"
+import { RefreshCw } from "lucide-react"
 import { useAccount } from "wagmi"
 
 import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert"
 import { Button } from "@/components/ui/button"
 import { Skeleton } from "@/components/ui/skeleton"
-import {
-  Table,
-  TableBody,
-  TableCell,
-  TableHead,
-  TableHeader,
-  TableRow,
-} from "@/components/ui/table"
-import Transfer from "@/components/transfer"
-import { AppContext } from "@/app/index"
+import BalancesTable from "@/components/BalancesTable"
+import Swap from "@/components/swap"
 
 const LoadingSkeleton = () => {
   return (
@@ -38,83 +23,6 @@ const LoadingSkeleton = () => {
   )
 }
 
-const BalancesTable = ({
-  balances,
-  showAll,
-  toggleShowAll,
-  stakingAmountTotal,
-}: any) => {
-  return (
-    <div>
-      <Table>
-        <TableHeader>
-          <TableRow className="border-none hover:bg-transparent">
-            <TableHead className="pl-4">Asset</TableHead>
-            <TableHead>Type</TableHead>
-            <TableHead className="text-right">Price</TableHead>
-            <TableHead className="text-right">Balance</TableHead>
-          </TableRow>
-        </TableHeader>
-        <TableBody>
-          {balances
-            .slice(0, showAll ? balances.length : 5)
-            .map((b: any, index: any) => (
-              <TableRow key={index} className="border-none">
-                <TableCell className="pl-4 rounded-bl-xl rounded-tl-xl">
-                  <div>{b.ticker}</div>
-                  <div className="text-xs text-gray-400">{b.chain_name}</div>
-                </TableCell>
-                <TableCell>{b.coin_type}</TableCell>
-                <TableCell className="text-right">
-                  {b.price?.toFixed(2)}
-                </TableCell>
-                <TableCell className="rounded-br-xl rounded-tr-xl text-right">
-                  {parseFloat(b.balance).toFixed(2) || "N/A"}
-                  {b.ticker === "ZETA" && b.coin_type === "Gas" && (
-                    <div>
-                      <Button
-                        size="sm"
-                        variant="link"
-                        className="my-1 p-0 text-xs h-5"
-                        asChild
-                      >
-                        <Link href="/staking">
-                          <ArrowBigUp className="h-4 w-4 mr-0.5" />
-                          {stakingAmountTotal > 0 ? (
-                            <span>
-                              Staked:&nbsp;
-                              {parseFloat(
-                                formatUnits(stakingAmountTotal, 18)
-                              ).toFixed(0)}
-                            </span>
-                          ) : (
-                            <span>Stake ZETA</span>
-                          )}
-                        </Link>
-                      </Button>
-                    </div>
-                  )}
-                </TableCell>
-              </TableRow>
-            ))}
-        </TableBody>
-      </Table>
-      {balances?.length > 5 && (
-        <div className="my-4 flex justify-center">
-          <Button variant="link" onClick={toggleShowAll}>
-            {showAll ? "Collapse" : "Show all assets"}
-            {showAll ? (
-              <ChevronUp className="ml-2 h-4 w-4 shrink-0 opacity-75" />
-            ) : (
-              <ChevronDown className="ml-2 h-4 w-4 shrink-0 opacity-75" />
-            )}
-          </Button>
-        </div>
-      )}
-    </div>
-  )
-}
-
 const ConnectWallet = () => {
   return (
     <Alert>
@@ -134,7 +42,7 @@ export default function IndexPage() {
     fetchBalances,
     prices,
     stakingDelegations,
-  } = useContext(AppContext)
+  } = useAppContext()
   const [sortedBalances, setSortedBalances] = useState([])
   const [showAll, setShowAll] = useState(false)
 
@@ -150,12 +58,10 @@ export default function IndexPage() {
 
   const balancesPrices = sortedBalances.map((balance: any) => {
     const normalizeSymbol = (symbol: string) => symbol.replace(/^[tg]/, "")
-
     const normalizedSymbol = normalizeSymbol(balance.symbol)
     const priceObj = prices.find(
       (price: any) => normalizeSymbol(price.symbol) === normalizedSymbol
     )
-
     return {
       ...balance,
       price: priceObj ? priceObj.price : null,
@@ -173,20 +79,18 @@ export default function IndexPage() {
         // Prioritize ZETA
         if (a.ticker === "ZETA" && a.coin_type === "Gas") return -1
         if (b.ticker === "ZETA" && b.coin_type === "Gas") return 1
-
         if (a.coin_type === "Gas" && b.coin_type !== "Gas") return -1
         if (a.coin_type !== "Gas" && b.coin_type === "Gas") return 1
         return a.chain_name < b.chain_name ? -1 : 1
       })
-      .filter((b: any) => {
-        return b.balance > 0
-      })
+      .filter((b: any) => b.balance > 0)
     setSortedBalances(balance)
   }, [balances])
 
-  const balancesTotal = balancesPrices.reduce((a: any, c: any) => {
-    return a + parseFloat(c.balance)
-  }, 0)
+  const balancesTotal = balancesPrices.reduce(
+    (a: any, c: any) => a + parseFloat(c.balance),
+    0
+  )
 
   const formatBalanceTotal = (b: string) => {
     if (parseFloat(b) > 1000) {
@@ -199,7 +103,7 @@ export default function IndexPage() {
   return (
     <div>
       <div className="grid sm:grid-cols-3 gap-x-10">
-        <div className="sm:col-span-2 overflow-x-scroll">
+        <div className="sm:col-span-2 overflow-x-scroll mb-20">
           <div className="mt-12 mb-8">
             <div className="px-3 text-sm mb-1 text-gray-400">Total balance</div>
             <div className="flex items-center justify-start gap-1">
@@ -227,17 +131,9 @@ export default function IndexPage() {
           ) : (
             <ConnectWallet />
           )}
-          <div className="my-5 flex space-x-2">
-            <Link href="/messaging" legacyBehavior passHref>
-              <Button variant="outline">
-                <MessageCircle className="mr-1 h-5 w-5" strokeWidth={1.5} />
-                Cross-Chain Messaging
-              </Button>
-            </Link>
-          </div>
         </div>
         <div className="mr-4">
-          <Transfer />
+          <Swap />
         </div>
       </div>
     </div>
diff --git a/app/pools/page.tsx b/app/pools/page.tsx
index 9613562..c3e9d6a 100644
--- a/app/pools/page.tsx
+++ b/app/pools/page.tsx
@@ -1,16 +1,16 @@
 "use client"
 
 import { useContext, useEffect, useState } from "react"
+import { useAppContext } from "@/context/AppContext"
 import { formatUnits } from "viem"
 import { useAccount } from "wagmi"
 
 import { Card } from "@/components/ui/card"
 import { Skeleton } from "@/components/ui/skeleton"
-import { AppContext } from "@/app/index"
 
 const PoolsPage = () => {
   const { pools, balances, balancesLoading, poolsLoading, fetchPools } =
-    useContext(AppContext)
+    useAppContext()
   const [poolsSorted, setPoolsSorted] = useState<any[]>([])
   const { address, isConnected } = useAccount()
 
diff --git a/app/staking/page.tsx b/app/staking/page.tsx
index 99add30..043f32b 100644
--- a/app/staking/page.tsx
+++ b/app/staking/page.tsx
@@ -2,6 +2,7 @@
 
 import { useCallback, useContext, useEffect, useState } from "react"
 import Link from "next/link"
+import { useAppContext } from "@/context/AppContext"
 import { generatePostBodyBroadcast } from "@evmos/provider"
 import {
   createTxMsgBeginRedelegate,
@@ -67,7 +68,6 @@ import {
   TableRow,
 } from "@/components/ui/table"
 import { useToast } from "@/components/ui/use-toast"
-import { AppContext } from "@/app/index"
 
 const StakingPage = () => {
   const {
@@ -84,7 +84,7 @@ const StakingPage = () => {
     fetchBalances,
     observers,
     fetchObservers,
-  } = useContext(AppContext)
+  } = useAppContext()
   const [selectedValidator, setSelectedValidator] = useState<any>(null)
   const [isSending, setIsSending] = useState(false)
   const [isZetaChain, setIsZetaChain] = useState(false)
diff --git a/components/BalancesTable.tsx b/components/BalancesTable.tsx
new file mode 100644
index 0000000..9cd7dbf
--- /dev/null
+++ b/components/BalancesTable.tsx
@@ -0,0 +1,92 @@
+import Link from "next/link"
+import { ArrowBigUp, ChevronDown, ChevronUp } from "lucide-react"
+import { formatUnits } from "viem"
+
+import { Button } from "@/components/ui/button"
+import {
+  Table,
+  TableBody,
+  TableCell,
+  TableHead,
+  TableHeader,
+  TableRow,
+} from "@/components/ui/table"
+
+const BalancesTable = ({
+  balances,
+  showAll,
+  toggleShowAll,
+  stakingAmountTotal,
+}: any) => {
+  return (
+    <div>
+      <Table>
+        <TableHeader>
+          <TableRow className="border-none hover:bg-transparent">
+            <TableHead className="pl-4">Asset</TableHead>
+            <TableHead>Type</TableHead>
+            <TableHead className="text-right">Price</TableHead>
+            <TableHead className="text-right">Balance</TableHead>
+          </TableRow>
+        </TableHeader>
+        <TableBody>
+          {balances
+            .slice(0, showAll ? balances.length : 5)
+            .map((b: any, index: any) => (
+              <TableRow key={index} className="border-none">
+                <TableCell className="pl-4 rounded-bl-xl rounded-tl-xl">
+                  <div>{b.ticker}</div>
+                  <div className="text-xs text-gray-400">{b.chain_name}</div>
+                </TableCell>
+                <TableCell>{b.coin_type}</TableCell>
+                <TableCell className="text-right">
+                  {b.price?.toFixed(2)}
+                </TableCell>
+                <TableCell className="rounded-br-xl rounded-tr-xl text-right">
+                  {parseFloat(b.balance).toFixed(2) || "N/A"}
+                  {b.ticker === "ZETA" && b.coin_type === "Gas" && (
+                    <div>
+                      <Button
+                        size="sm"
+                        variant="link"
+                        className="my-1 p-0 text-xs h-5"
+                        asChild
+                      >
+                        <Link href="/staking">
+                          <ArrowBigUp className="h-4 w-4 mr-0.5" />
+                          {stakingAmountTotal > 0 ? (
+                            <span>
+                              Staked:&nbsp;
+                              {parseFloat(
+                                formatUnits(stakingAmountTotal, 18)
+                              ).toFixed(0)}
+                            </span>
+                          ) : (
+                            <span>Stake ZETA</span>
+                          )}
+                        </Link>
+                      </Button>
+                    </div>
+                  )}
+                </TableCell>
+              </TableRow>
+            ))}
+        </TableBody>
+      </Table>
+      {balances?.length > 5 && (
+        <div className="my-4 flex justify-center">
+          <Button variant="link" onClick={toggleShowAll}>
+            {showAll ? "Collapse" : "Show all assets"}
+            {showAll ? (
+              <ChevronUp className="ml-2 h-4 w-4 shrink-0 opacity-75" />
+            ) : (
+              <ChevronDown className="ml-2 h-4 w-4 shrink-0 opacity-75" />
+            )}
+          </Button>
+        </div>
+      )}
+    </div>
+  )
+}
+
+export default BalancesTable
diff --git a/components/SwapToAnyToken.json b/components/SwapToAnyToken.json
new file mode 100644
index 0000000..879a8f3
--- /dev/null
+++ b/components/SwapToAnyToken.json
@@ -0,0 +1,143 @@
+{
+  "_format": "hh-sol-artifact-1",
+  "contractName": "SwapToAnyToken",
+  "sourceName": "contracts/SwapToAnyToken.sol",
+  "abi": [
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "systemContractAddress",
+          "type": "address"
+        }
+      ],
+      "stateMutability": "nonpayable",
+      "type": "constructor"
+    },
+    {
+      "inputs": [],
+      "name": "CantBeIdenticalAddresses",
+      "type": "error"
+    },
+    {
+      "inputs": [],
+      "name": "CantBeZeroAddress",
+      "type": "error"
+    },
+    {
+      "inputs": [],
+      "name": "OffsetOutOfBounds",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "string",
+          "name": "",
+          "type": "string"
+        }
+      ],
+      "name": "OnlySystemContract",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "components": [
+            {
+              "internalType": "bytes",
+              "name": "origin",
+              "type": "bytes"
+            },
+            {
+              "internalType": "address",
+              "name": "sender",
+              "type": "address"
+            },
+            {
+              "internalType": "uint256",
+              "name": "chainID",
+              "type": "uint256"
+            }
+          ],
+          "internalType": "struct zContext",
+          "name": "context",
+          "type": "tuple"
+        },
+        {
+          "internalType": "address",
+          "name": "zrc20",
+          "type": "address"
+        },
+        {
+          "internalType": "uint256",
+          "name": "amount",
+          "type": "uint256"
+        },
+        {
+          "internalType": "bytes",
+          "name": "message",
+          "type": "bytes"
+        }
+      ],
+      "name": "onCrossChainCall",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "inputToken",
+          "type": "address"
+        },
+        {
+          "internalType": "uint256",
+          "name": "amount",
+          "type": "uint256"
+        },
+        {
+          "internalType": "address",
+          "name": "targetToken",
+          "type": "address"
+        },
+        {
+          "internalType": "bytes",
+          "name": "recipient",
+          "type": "bytes"
+        },
+        {
+          "internalType": "bool",
+          "name": "withdraw",
+          "type": "bool"
+        }
+      ],
+      "name": "swap",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "systemContract",
+      "outputs": [
+        {
+          "internalType": "contract SystemContract",
+          "name": "",
+          "type": "address"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "stateMutability": "payable",
+      "type": "receive"
+    }
+  ],
+  "bytecode": "0x60806040523480156200001157600080fd5b506040516200262a3803806200262a833981810160405281019062000037919062000095565b806000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550506200011a565b6000815190506200008f8162000100565b92915050565b600060208284031215620000ae57620000ad620000fb565b5b6000620000be848285016200007e565b91505092915050565b6000620000d482620000db565b9050919050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b600080fd5b6200010b81620000c7565b81146200011757600080fd5b50565b612500806200012a6000396000f3fe6080604052600436106100385760003560e01c806374718c5814610044578063bb88b7691461006d578063de43156e146100985761003f565b3661003f57005b600080fd5b34801561005057600080fd5b5061006b600480360381019061006691906119f9565b6100c1565b005b34801561007957600080fd5b50610082610165565b60405161008f9190611e8d565b60405180910390f35b3480156100a457600080fd5b506100bf60048036038101906100ba9190611b06565b610189565b005b8473ffffffffffffffffffffffffffffffffffffffff166323b872dd3330876040518463ffffffff1660e01b81526004016100fe93929190611dfd565b602060405180830381600087803b15801561011857600080fd5b505af115801561012c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101509190611ad9565b5061015e85858585856103a1565b5050505050565b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff168073ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614610218576040517f14c6658d00000000000000000000000000000000000000000000000000000000815260040161020f90611ea8565b60405180910390fd5b60006040518060600160405280600073ffffffffffffffffffffffffffffffffffffffff16815260200160405180602001604052806000815250815260200160011515815250905061479c876040013514156103105761027a8484600061081e565b816000019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff16815250506102bd8484601461081e565b6040516020016102cd9190611d59565b60405160208183030381529060405281602001819052506029848490501061030b576102fb84846028610893565b8160400190151590811515815250505b61037f565b60008060008686810190610324919061194a565b92509250925082846000019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff1681525050818460200181905250808460400190151590811515815250505050505b61039886868360000151846020015185604001516103a1565b50505050505050565b6000806000808415610462578673ffffffffffffffffffffffffffffffffffffffff1663d9eeebed6040518163ffffffff1660e01b8152600401604080518083038186803b1580156103f257600080fd5b505afa158015610406573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061042a91906119b9565b809250819350505061045f60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff168a83858c610901565b92505b6104a760008054906101000a900473ffffffffffffffffffffffffffffffffffffffff168a87610492578a61049f565b858b61049e91906120d1565b5b8a6000610e9a565b935084156105d0578173ffffffffffffffffffffffffffffffffffffffff1663095ea7b388836040518363ffffffff1660e01b81526004016104ea929190611e34565b602060405180830381600087803b15801561050457600080fd5b505af1158015610518573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061053c9190611ad9565b508673ffffffffffffffffffffffffffffffffffffffff1663c701262687866040518363ffffffff1660e01b8152600401610578929190611e5d565b602060405180830381600087803b15801561059257600080fd5b505af11580156105a6573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105ca9190611ad9565b50610813565b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663569541b96040518163ffffffff1660e01b815260040160206040518083038186803b15801561063957600080fd5b505afa15801561064d573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610671919061191d565b90508073ffffffffffffffffffffffffffffffffffffffff168873ffffffffffffffffffffffffffffffffffffffff161415610770578073ffffffffffffffffffffffffffffffffffffffff16632e1a7d4d866040518263ffffffff1660e01b81526004016106e09190611ec8565b600060405180830381600087803b1580156106fa57600080fd5b505af115801561070e573d6000803e3d6000fd5b5050505060008761071e90612195565b60601c90508073ffffffffffffffffffffffffffffffffffffffff166108fc879081150290604051600060405180830381858888f19350505050158015610769573d6000803e3d6000fd5b5050610811565b60008761077c90612195565b60601c90508873ffffffffffffffffffffffffffffffffffffffff1663a9059cbb82886040518363ffffffff1660e01b81526004016107bc929190611e34565b602060405180830381600087803b1580156107d657600080fd5b505af11580156107ea573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061080e9190611ad9565b50505b505b505050505050505050565b60008084848490601486610832919061207b565b9261083f93929190612040565b8080601f016020809104026020016040519081016040528093929190818152602001838380828437600081840152601f19601f82011690508083019250505050505050905060148101519150509392505050565b60008383905082106108d1576040517f9605a01000000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60008484848181106108e6576108e5612302565b5b9050013560f81c60f81b60f81c60ff16141590509392505050565b60008061098c8773ffffffffffffffffffffffffffffffffffffffff1663d936a0126040518163ffffffff1660e01b815260040160206040518083038186803b15801561094d57600080fd5b505afa158015610961573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610985919061191d565b878661143f565b905060608115610a8557600267ffffffffffffffff8111156109b1576109b0612331565b5b6040519080825280602002602001820160405280156109df5781602001602082028036833780820191505090505b50905086816000815181106109f7576109f6612302565b5b602002602001019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff16815250508481600181518110610a4657610a45612302565b5b602002602001019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff1681525050610c3c565b600367ffffffffffffffff811115610aa057610a9f612331565b5b604051908082528060200260200182016040528015610ace5781602001602082028036833780820191505090505b5090508681600081518110610ae657610ae5612302565b5b602002602001019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff16815250508773ffffffffffffffffffffffffffffffffffffffff1663569541b96040518163ffffffff1660e01b815260040160206040518083038186803b158015610b6657600080fd5b505afa158015610b7a573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610b9e919061191d565b81600181518110610bb257610bb1612302565b5b602002602001019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff16815250508481600281518110610c0157610c00612302565b5b602002602001019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff16815250505b8673ffffffffffffffffffffffffffffffffffffffff1663095ea7b38973ffffffffffffffffffffffffffffffffffffffff1663842da36d6040518163ffffffff1660e01b815260040160206040518083038186803b158015610c9e57600080fd5b505afa158015610cb2573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610cd6919061191d565b866040518363ffffffff1660e01b8152600401610cf4929190611e34565b602060405180830381600087803b158015610d0e57600080fd5b505af1158015610d22573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610d469190611ad9565b5060008873ffffffffffffffffffffffffffffffffffffffff1663842da36d6040518163ffffffff1660e01b815260040160206040518083038186803b158015610d8f57600080fd5b505afa158015610da3573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610dc7919061191d565b73ffffffffffffffffffffffffffffffffffffffff16638803dbee8887853060c861ffff1642610df7919061207b565b6040518663ffffffff1660e01b8152600401610e17959493929190611ee3565b600060405180830381600087803b158015610e3157600080fd5b505af1158015610e45573d6000803e3d6000fd5b505050506040513d6000823e3d601f19601f82011682018060405250810190610e6e9190611a90565b905080600081518110610e8457610e83612302565b5b6020026020010151935050505095945050505050565b600080610f258773ffffffffffffffffffffffffffffffffffffffff1663d936a0126040518163ffffffff1660e01b815260040160206040518083038186803b158015610ee657600080fd5b505afa158015610efa573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610f1e919061191d565b878661143f565b90506060811561101e57600267ffffffffffffffff811115610f4a57610f49612331565b5b604051908082528060200260200182016040528015610f785781602001602082028036833780820191505090505b5090508681600081518110610f9057610f8f612302565b5b602002602001019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff16815250508481600181518110610fdf57610fde612302565b5b602002602001019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff16815250506111d5565b600367ffffffffffffffff81111561103957611038612331565b5b6040519080825280602002602001820160405280156110675781602001602082028036833780820191505090505b509050868160008151811061107f5761107e612302565b5b602002602001019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff16815250508773ffffffffffffffffffffffffffffffffffffffff1663569541b96040518163ffffffff1660e01b815260040160206040518083038186803b1580156110ff57600080fd5b505afa158015611113573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611137919061191d565b8160018151811061114b5761114a612302565b5b602002602001019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff1681525050848160028151811061119a57611199612302565b5b602002602001019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff16815250505b8673ffffffffffffffffffffffffffffffffffffffff1663095ea7b38973ffffffffffffffffffffffffffffffffffffffff1663842da36d6040518163ffffffff1660e01b815260040160206040518083038186803b15801561123757600080fd5b505afa15801561124b573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061126f919061191d565b886040518363ffffffff1660e01b815260040161128d929190611e34565b602060405180830381600087803b1580156112a757600080fd5b505af11580156112bb573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906112df9190611ad9565b5060008873ffffffffffffffffffffffffffffffffffffffff1663842da36d6040518163ffffffff1660e01b815260040160206040518083038186803b15801561132857600080fd5b505afa15801561133c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611360919061191d565b73ffffffffffffffffffffffffffffffffffffffff166338ed17398887853060c861ffff1642611390919061207b565b6040518663ffffffff1660e01b81526004016113b0959493929190611ee3565b600060405180830381600087803b1580156113ca57600080fd5b505af11580156113de573d6000803e3d6000fd5b505050506040513d6000823e3d601f19601f820116820180604052508101906114079190611a90565b9050806001835161141891906120d1565b8151811061142957611428612302565b5b6020026020010151935050505095945050505050565b60008061144d858585611579565b905060008473ffffffffffffffffffffffffffffffffffffffff166370a08231836040518263ffffffff1660e01b815260040161148a9190611de2565b60206040518083038186803b1580156114a257600080fd5b505afa1580156114b6573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906114da9190611baa565b11801561156f575060008373ffffffffffffffffffffffffffffffffffffffff166370a08231836040518263ffffffff1660e01b815260040161151d9190611de2565b60206040518083038186803b15801561153557600080fd5b505afa158015611549573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061156d9190611baa565b115b9150509392505050565b600080600061158885856115eb565b915091508582826040516020016115a0929190611d74565b604051602081830303815290604052805190602001206040516020016115c7929190611da0565b6040516020818303038152906040528051906020012060001c925050509392505050565b6000808273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff161415611654576040517fcb1e7cfe00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b8273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff161061168e578284611691565b83835b8092508193505050600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff161415611700576040517f78b507da00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b9250929050565b600061171a61171584611f62565b611f3d565b9050808382526020820190508285602086028201111561173d5761173c61238e565b5b60005b8581101561176d57816117538882611908565b845260208401935060208301925050600181019050611740565b5050509392505050565b600061178a61178584611f8e565b611f3d565b9050828152602081018484840111156117a6576117a5612393565b5b6117b1848285612232565b509392505050565b6000813590506117c88161246e565b92915050565b6000815190506117dd8161246e565b92915050565b6000813590506117f281612485565b92915050565b600082601f83011261180d5761180c61237a565b5b815161181d848260208601611707565b91505092915050565b6000813590506118358161249c565b92915050565b60008151905061184a8161249c565b92915050565b60008083601f8401126118665761186561237a565b5b8235905067ffffffffffffffff81111561188357611882612375565b5b60208301915083600182028301111561189f5761189e61238e565b5b9250929050565b600082601f8301126118bb576118ba61237a565b5b81356118cb848260208601611777565b91505092915050565b6000606082840312156118ea576118e961237f565b5b81905092915050565b600081359050611902816124b3565b92915050565b600081519050611917816124b3565b92915050565b6000602082840312156119335761193261239d565b5b6000611941848285016117ce565b91505092915050565b6000806000606084860312156119635761196261239d565b5b6000611971868287016117e3565b935050602084013567ffffffffffffffff81111561199257611991612398565b5b61199e868287016118a6565b92505060406119af86828701611826565b9150509250925092565b600080604083850312156119d0576119cf61239d565b5b60006119de858286016117ce565b92505060206119ef85828601611908565b9150509250929050565b600080600080600060a08688031215611a1557611a1461239d565b5b6000611a23888289016117b9565b9550506020611a34888289016118f3565b9450506040611a45888289016117b9565b935050606086013567ffffffffffffffff811115611a6657611a65612398565b5b611a72888289016118a6565b9250506080611a8388828901611826565b9150509295509295909350565b600060208284031215611aa657611aa561239d565b5b600082015167ffffffffffffffff811115611ac457611ac3612398565b5b611ad0848285016117f8565b91505092915050565b600060208284031215611aef57611aee61239d565b5b6000611afd8482850161183b565b91505092915050565b600080600080600060808688031215611b2257611b2161239d565b5b600086013567ffffffffffffffff811115611b4057611b3f612398565b5b611b4c888289016118d4565b9550506020611b5d888289016117b9565b9450506040611b6e888289016118f3565b935050606086013567ffffffffffffffff811115611b8f57611b8e612398565b5b611b9b88828901611850565b92509250509295509295909350565b600060208284031215611bc057611bbf61239d565b5b6000611bce84828501611908565b91505092915050565b6000611be38383611bef565b60208301905092915050565b611bf881612105565b82525050565b611c0781612105565b82525050565b611c1e611c1982612105565b6122a5565b82525050565b6000611c2f82611fdf565b611c398185612002565b9350611c4483611fbf565b8060005b83811015611c75578151611c5c8882611bd7565b9750611c6783611ff5565b925050600181019050611c48565b5085935050505092915050565b611c93611c8e82612161565b6122b7565b82525050565b6000611ca482611fea565b611cae8185612013565b9350611cbe818560208601612241565b611cc7816123a2565b840191505092915050565b611cdb816121fc565b82525050565b6000611cee602b83612024565b9150611cf9826123cd565b604082019050919050565b6000611d11602083612035565b9150611d1c8261241c565b602082019050919050565b6000611d34600183612035565b9150611d3f82612445565b600182019050919050565b611d538161218b565b82525050565b6000611d658284611c0d565b60148201915081905092915050565b6000611d808285611c0d565b601482019150611d908284611c0d565b6014820191508190509392505050565b6000611dab82611d27565b9150611db78285611c0d565b601482019150611dc78284611c82565b602082019150611dd682611d04565b91508190509392505050565b6000602082019050611df76000830184611bfe565b92915050565b6000606082019050611e126000830186611bfe565b611e1f6020830185611bfe565b611e2c6040830184611d4a565b949350505050565b6000604082019050611e496000830185611bfe565b611e566020830184611d4a565b9392505050565b60006040820190508181036000830152611e778185611c99565b9050611e866020830184611d4a565b9392505050565b6000602082019050611ea26000830184611cd2565b92915050565b60006020820190508181036000830152611ec181611ce1565b9050919050565b6000602082019050611edd6000830184611d4a565b92915050565b600060a082019050611ef86000830188611d4a565b611f056020830187611d4a565b8181036040830152611f178186611c24565b9050611f266060830185611bfe565b611f336080830184611d4a565b9695505050505050565b6000611f47611f58565b9050611f538282612274565b919050565b6000604051905090565b600067ffffffffffffffff821115611f7d57611f7c612331565b5b602082029050602081019050919050565b600067ffffffffffffffff821115611fa957611fa8612331565b5b611fb2826123a2565b9050602081019050919050565b6000819050602082019050919050565b6000819050602082019050919050565b600081519050919050565b600081519050919050565b6000602082019050919050565b600082825260208201905092915050565b600082825260208201905092915050565b600082825260208201905092915050565b600081905092915050565b6000808585111561205457612053612389565b5b8386111561206557612064612384565b5b6001850283019150848603905094509492505050565b60006120868261218b565b91506120918361218b565b9250827fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff038211156120c6576120c56122d3565b5b828201905092915050565b60006120dc8261218b565b91506120e78361218b565b9250828210156120fa576120f96122d3565b5b828203905092915050565b60006121108261216b565b9050919050565b60006121228261216b565b9050919050565b60008115159050919050565b60007fffffffffffffffffffffffffffffffffffffffff00000000000000000000000082169050919050565b6000819050919050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000819050919050565b60006121a082611fea565b826121aa84611fcf565b90506121b581612360565b925060148210156121f5576121f07fffffffffffffffffffffffffffffffffffffffff000000000000000000000000836014036008026123c0565b831692505b5050919050565b60006122078261220e565b9050919050565b600061221982612220565b9050919050565b600061222b8261216b565b9050919050565b82818337600083830152505050565b60005b8381101561225f578082015181840152602081019050612244565b8381111561226e576000848401525b50505050565b61227d826123a2565b810181811067ffffffffffffffff8211171561229c5761229b612331565b5b80604052505050565b60006122b0826122c1565b9050919050565b6000819050919050565b60006122cc826123b3565b9050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b600061236c8251612135565b80915050919050565b600080fd5b600080fd5b600080fd5b600080fd5b600080fd5b600080fd5b600080fd5b600080fd5b600080fd5b6000601f19601f8301169050919050565b60008160601b9050919050565b600082821b905092915050565b7f4f6e6c792073797374656d20636f6e74726163742063616e2063616c6c20746860008201527f69732066756e6374696f6e000000000000000000000000000000000000000000602082015250565b7f96e8ac4277198ff8b6f785478aa9a39f403cb768dd02cbee326c3e7da348845f600082015250565b7fff00000000000000000000000000000000000000000000000000000000000000600082015250565b61247781612105565b811461248257600080fd5b50565b61248e81612117565b811461249957600080fd5b50565b6124a581612129565b81146124b057600080fd5b50565b6124bc8161218b565b81146124c757600080fd5b5056fea26469706673582212203c781539b7c12f169a29a309c8e44f90edfd9e9695cd21c3762d33e0b266d21c64736f6c63430008070033",
+  "deployedBytecode": "0x6080604052600436106100385760003560e01c806374718c5814610044578063bb88b7691461006d578063de43156e146100985761003f565b3661003f57005b600080fd5b34801561005057600080fd5b5061006b600480360381019061006691906119f9565b6100c1565b005b34801561007957600080fd5b50610082610165565b60405161008f9190611e8d565b60405180910390f35b3480156100a457600080fd5b506100bf60048036038101906100ba9190611b06565b610189565b005b8473ffffffffffffffffffffffffffffffffffffffff166323b872dd3330876040518463ffffffff1660e01b81526004016100fe93929190611dfd565b602060405180830381600087803b15801561011857600080fd5b505af115801561012c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101509190611ad9565b5061015e85858585856103a1565b5050505050565b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff168073ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614610218576040517f14c6658d00000000000000000000000000000000000000000000000000000000815260040161020f90611ea8565b60405180910390fd5b60006040518060600160405280600073ffffffffffffffffffffffffffffffffffffffff16815260200160405180602001604052806000815250815260200160011515815250905061479c876040013514156103105761027a8484600061081e565b816000019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff16815250506102bd8484601461081e565b6040516020016102cd9190611d59565b60405160208183030381529060405281602001819052506029848490501061030b576102fb84846028610893565b8160400190151590811515815250505b61037f565b60008060008686810190610324919061194a565b92509250925082846000019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff1681525050818460200181905250808460400190151590811515815250505050505b61039886868360000151846020015185604001516103a1565b50505050505050565b6000806000808415610462578673ffffffffffffffffffffffffffffffffffffffff1663d9eeebed6040518163ffffffff1660e01b8152600401604080518083038186803b1580156103f257600080fd5b505afa158015610406573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061042a91906119b9565b809250819350505061045f60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff168a83858c610901565b92505b6104a760008054906101000a900473ffffffffffffffffffffffffffffffffffffffff168a87610492578a61049f565b858b61049e91906120d1565b5b8a6000610e9a565b935084156105d0578173ffffffffffffffffffffffffffffffffffffffff1663095ea7b388836040518363ffffffff1660e01b81526004016104ea929190611e34565b602060405180830381600087803b15801561050457600080fd5b505af1158015610518573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061053c9190611ad9565b508673ffffffffffffffffffffffffffffffffffffffff1663c701262687866040518363ffffffff1660e01b8152600401610578929190611e5d565b602060405180830381600087803b15801561059257600080fd5b505af11580156105a6573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105ca9190611ad9565b50610813565b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663569541b96040518163ffffffff1660e01b815260040160206040518083038186803b15801561063957600080fd5b505afa15801561064d573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610671919061191d565b90508073ffffffffffffffffffffffffffffffffffffffff168873ffffffffffffffffffffffffffffffffffffffff161415610770578073ffffffffffffffffffffffffffffffffffffffff16632e1a7d4d866040518263ffffffff1660e01b81526004016106e09190611ec8565b600060405180830381600087803b1580156106fa57600080fd5b505af115801561070e573d6000803e3d6000fd5b5050505060008761071e90612195565b60601c90508073ffffffffffffffffffffffffffffffffffffffff166108fc879081150290604051600060405180830381858888f19350505050158015610769573d6000803e3d6000fd5b5050610811565b60008761077c90612195565b60601c90508873ffffffffffffffffffffffffffffffffffffffff1663a9059cbb82886040518363ffffffff1660e01b81526004016107bc929190611e34565b602060405180830381600087803b1580156107d657600080fd5b505af11580156107ea573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061080e9190611ad9565b50505b505b505050505050505050565b60008084848490601486610832919061207b565b9261083f93929190612040565b8080601f016020809104026020016040519081016040528093929190818152602001838380828437600081840152601f19601f82011690508083019250505050505050905060148101519150509392505050565b60008383905082106108d1576040517f9605a01000000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60008484848181106108e6576108e5612302565b5b9050013560f81c60f81b60f81c60ff16141590509392505050565b60008061098c8773ffffffffffffffffffffffffffffffffffffffff1663d936a0126040518163ffffffff1660e01b815260040160206040518083038186803b15801561094d57600080fd5b505afa158015610961573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610985919061191d565b878661143f565b905060608115610a8557600267ffffffffffffffff8111156109b1576109b0612331565b5b6040519080825280602002602001820160405280156109df5781602001602082028036833780820191505090505b50905086816000815181106109f7576109f6612302565b5b602002602001019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff16815250508481600181518110610a4657610a45612302565b5b602002602001019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff1681525050610c3c565b600367ffffffffffffffff811115610aa057610a9f612331565b5b604051908082528060200260200182016040528015610ace5781602001602082028036833780820191505090505b5090508681600081518110610ae657610ae5612302565b5b602002602001019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff16815250508773ffffffffffffffffffffffffffffffffffffffff1663569541b96040518163ffffffff1660e01b815260040160206040518083038186803b158015610b6657600080fd5b505afa158015610b7a573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610b9e919061191d565b81600181518110610bb257610bb1612302565b5b602002602001019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff16815250508481600281518110610c0157610c00612302565b5b602002602001019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff16815250505b8673ffffffffffffffffffffffffffffffffffffffff1663095ea7b38973ffffffffffffffffffffffffffffffffffffffff1663842da36d6040518163ffffffff1660e01b815260040160206040518083038186803b158015610c9e57600080fd5b505afa158015610cb2573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610cd6919061191d565b866040518363ffffffff1660e01b8152600401610cf4929190611e34565b602060405180830381600087803b158015610d0e57600080fd5b505af1158015610d22573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610d469190611ad9565b5060008873ffffffffffffffffffffffffffffffffffffffff1663842da36d6040518163ffffffff1660e01b815260040160206040518083038186803b158015610d8f57600080fd5b505afa158015610da3573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610dc7919061191d565b73ffffffffffffffffffffffffffffffffffffffff16638803dbee8887853060c861ffff1642610df7919061207b565b6040518663ffffffff1660e01b8152600401610e17959493929190611ee3565b600060405180830381600087803b158015610e3157600080fd5b505af1158015610e45573d6000803e3d6000fd5b505050506040513d6000823e3d601f19601f82011682018060405250810190610e6e9190611a90565b905080600081518110610e8457610e83612302565b5b6020026020010151935050505095945050505050565b600080610f258773ffffffffffffffffffffffffffffffffffffffff1663d936a0126040518163ffffffff1660e01b815260040160206040518083038186803b158015610ee657600080fd5b505afa158015610efa573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610f1e919061191d565b878661143f565b90506060811561101e57600267ffffffffffffffff811115610f4a57610f49612331565b5b604051908082528060200260200182016040528015610f785781602001602082028036833780820191505090505b5090508681600081518110610f9057610f8f612302565b5b602002602001019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff16815250508481600181518110610fdf57610fde612302565b5b602002602001019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff16815250506111d5565b600367ffffffffffffffff81111561103957611038612331565b5b6040519080825280602002602001820160405280156110675781602001602082028036833780820191505090505b509050868160008151811061107f5761107e612302565b5b602002602001019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff16815250508773ffffffffffffffffffffffffffffffffffffffff1663569541b96040518163ffffffff1660e01b815260040160206040518083038186803b1580156110ff57600080fd5b505afa158015611113573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611137919061191d565b8160018151811061114b5761114a612302565b5b602002602001019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff1681525050848160028151811061119a57611199612302565b5b602002602001019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff16815250505b8673ffffffffffffffffffffffffffffffffffffffff1663095ea7b38973ffffffffffffffffffffffffffffffffffffffff1663842da36d6040518163ffffffff1660e01b815260040160206040518083038186803b15801561123757600080fd5b505afa15801561124b573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061126f919061191d565b886040518363ffffffff1660e01b815260040161128d929190611e34565b602060405180830381600087803b1580156112a757600080fd5b505af11580156112bb573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906112df9190611ad9565b5060008873ffffffffffffffffffffffffffffffffffffffff1663842da36d6040518163ffffffff1660e01b815260040160206040518083038186803b15801561132857600080fd5b505afa15801561133c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611360919061191d565b73ffffffffffffffffffffffffffffffffffffffff166338ed17398887853060c861ffff1642611390919061207b565b6040518663ffffffff1660e01b81526004016113b0959493929190611ee3565b600060405180830381600087803b1580156113ca57600080fd5b505af11580156113de573d6000803e3d6000fd5b505050506040513d6000823e3d601f19601f820116820180604052508101906114079190611a90565b9050806001835161141891906120d1565b8151811061142957611428612302565b5b6020026020010151935050505095945050505050565b60008061144d858585611579565b905060008473ffffffffffffffffffffffffffffffffffffffff166370a08231836040518263ffffffff1660e01b815260040161148a9190611de2565b60206040518083038186803b1580156114a257600080fd5b505afa1580156114b6573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906114da9190611baa565b11801561156f575060008373ffffffffffffffffffffffffffffffffffffffff166370a08231836040518263ffffffff1660e01b815260040161151d9190611de2565b60206040518083038186803b15801561153557600080fd5b505afa158015611549573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061156d9190611baa565b115b9150509392505050565b600080600061158885856115eb565b915091508582826040516020016115a0929190611d74565b604051602081830303815290604052805190602001206040516020016115c7929190611da0565b6040516020818303038152906040528051906020012060001c925050509392505050565b6000808273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff161415611654576040517fcb1e7cfe00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b8273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff161061168e578284611691565b83835b8092508193505050600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff161415611700576040517f78b507da00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b9250929050565b600061171a61171584611f62565b611f3d565b9050808382526020820190508285602086028201111561173d5761173c61238e565b5b60005b8581101561176d57816117538882611908565b845260208401935060208301925050600181019050611740565b5050509392505050565b600061178a61178584611f8e565b611f3d565b9050828152602081018484840111156117a6576117a5612393565b5b6117b1848285612232565b509392505050565b6000813590506117c88161246e565b92915050565b6000815190506117dd8161246e565b92915050565b6000813590506117f281612485565b92915050565b600082601f83011261180d5761180c61237a565b5b815161181d848260208601611707565b91505092915050565b6000813590506118358161249c565b92915050565b60008151905061184a8161249c565b92915050565b60008083601f8401126118665761186561237a565b5b8235905067ffffffffffffffff81111561188357611882612375565b5b60208301915083600182028301111561189f5761189e61238e565b5b9250929050565b600082601f8301126118bb576118ba61237a565b5b81356118cb848260208601611777565b91505092915050565b6000606082840312156118ea576118e961237f565b5b81905092915050565b600081359050611902816124b3565b92915050565b600081519050611917816124b3565b92915050565b6000602082840312156119335761193261239d565b5b6000611941848285016117ce565b91505092915050565b6000806000606084860312156119635761196261239d565b5b6000611971868287016117e3565b935050602084013567ffffffffffffffff81111561199257611991612398565b5b61199e868287016118a6565b92505060406119af86828701611826565b9150509250925092565b600080604083850312156119d0576119cf61239d565b5b60006119de858286016117ce565b92505060206119ef85828601611908565b9150509250929050565b600080600080600060a08688031215611a1557611a1461239d565b5b6000611a23888289016117b9565b9550506020611a34888289016118f3565b9450506040611a45888289016117b9565b935050606086013567ffffffffffffffff811115611a6657611a65612398565b5b611a72888289016118a6565b9250506080611a8388828901611826565b9150509295509295909350565b600060208284031215611aa657611aa561239d565b5b600082015167ffffffffffffffff811115611ac457611ac3612398565b5b611ad0848285016117f8565b91505092915050565b600060208284031215611aef57611aee61239d565b5b6000611afd8482850161183b565b91505092915050565b600080600080600060808688031215611b2257611b2161239d565b5b600086013567ffffffffffffffff811115611b4057611b3f612398565b5b611b4c888289016118d4565b9550506020611b5d888289016117b9565b9450506040611b6e888289016118f3565b935050606086013567ffffffffffffffff811115611b8f57611b8e612398565b5b611b9b88828901611850565b92509250509295509295909350565b600060208284031215611bc057611bbf61239d565b5b6000611bce84828501611908565b91505092915050565b6000611be38383611bef565b60208301905092915050565b611bf881612105565b82525050565b611c0781612105565b82525050565b611c1e611c1982612105565b6122a5565b82525050565b6000611c2f82611fdf565b611c398185612002565b9350611c4483611fbf565b8060005b83811015611c75578151611c5c8882611bd7565b9750611c6783611ff5565b925050600181019050611c48565b5085935050505092915050565b611c93611c8e82612161565b6122b7565b82525050565b6000611ca482611fea565b611cae8185612013565b9350611cbe818560208601612241565b611cc7816123a2565b840191505092915050565b611cdb816121fc565b82525050565b6000611cee602b83612024565b9150611cf9826123cd565b604082019050919050565b6000611d11602083612035565b9150611d1c8261241c565b602082019050919050565b6000611d34600183612035565b9150611d3f82612445565b600182019050919050565b611d538161218b565b82525050565b6000611d658284611c0d565b60148201915081905092915050565b6000611d808285611c0d565b601482019150611d908284611c0d565b6014820191508190509392505050565b6000611dab82611d27565b9150611db78285611c0d565b601482019150611dc78284611c82565b602082019150611dd682611d04565b91508190509392505050565b6000602082019050611df76000830184611bfe565b92915050565b6000606082019050611e126000830186611bfe565b611e1f6020830185611bfe565b611e2c6040830184611d4a565b949350505050565b6000604082019050611e496000830185611bfe565b611e566020830184611d4a565b9392505050565b60006040820190508181036000830152611e778185611c99565b9050611e866020830184611d4a565b9392505050565b6000602082019050611ea26000830184611cd2565b92915050565b60006020820190508181036000830152611ec181611ce1565b9050919050565b6000602082019050611edd6000830184611d4a565b92915050565b600060a082019050611ef86000830188611d4a565b611f056020830187611d4a565b8181036040830152611f178186611c24565b9050611f266060830185611bfe565b611f336080830184611d4a565b9695505050505050565b6000611f47611f58565b9050611f538282612274565b919050565b6000604051905090565b600067ffffffffffffffff821115611f7d57611f7c612331565b5b602082029050602081019050919050565b600067ffffffffffffffff821115611fa957611fa8612331565b5b611fb2826123a2565b9050602081019050919050565b6000819050602082019050919050565b6000819050602082019050919050565b600081519050919050565b600081519050919050565b6000602082019050919050565b600082825260208201905092915050565b600082825260208201905092915050565b600082825260208201905092915050565b600081905092915050565b6000808585111561205457612053612389565b5b8386111561206557612064612384565b5b6001850283019150848603905094509492505050565b60006120868261218b565b91506120918361218b565b9250827fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff038211156120c6576120c56122d3565b5b828201905092915050565b60006120dc8261218b565b91506120e78361218b565b9250828210156120fa576120f96122d3565b5b828203905092915050565b60006121108261216b565b9050919050565b60006121228261216b565b9050919050565b60008115159050919050565b60007fffffffffffffffffffffffffffffffffffffffff00000000000000000000000082169050919050565b6000819050919050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000819050919050565b60006121a082611fea565b826121aa84611fcf565b90506121b581612360565b925060148210156121f5576121f07fffffffffffffffffffffffffffffffffffffffff000000000000000000000000836014036008026123c0565b831692505b5050919050565b60006122078261220e565b9050919050565b600061221982612220565b9050919050565b600061222b8261216b565b9050919050565b82818337600083830152505050565b60005b8381101561225f578082015181840152602081019050612244565b8381111561226e576000848401525b50505050565b61227d826123a2565b810181811067ffffffffffffffff8211171561229c5761229b612331565b5b80604052505050565b60006122b0826122c1565b9050919050565b6000819050919050565b60006122cc826123b3565b9050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b600061236c8251612135565b80915050919050565b600080fd5b600080fd5b600080fd5b600080fd5b600080fd5b600080fd5b600080fd5b600080fd5b600080fd5b6000601f19601f8301169050919050565b60008160601b9050919050565b600082821b905092915050565b7f4f6e6c792073797374656d20636f6e74726163742063616e2063616c6c20746860008201527f69732066756e6374696f6e000000000000000000000000000000000000000000602082015250565b7f96e8ac4277198ff8b6f785478aa9a39f403cb768dd02cbee326c3e7da348845f600082015250565b7fff00000000000000000000000000000000000000000000000000000000000000600082015250565b61247781612105565b811461248257600080fd5b50565b61248e81612117565b811461249957600080fd5b50565b6124a581612129565b81146124b057600080fd5b50565b6124bc8161218b565b81146124c757600080fd5b5056fea26469706673582212203c781539b7c12f169a29a309c8e44f90edfd9e9695cd21c3762d33e0b266d21c64736f6c63430008070033",
+  "linkReferences": {},
+  "deployedLinkReferences": {}
+}
diff --git a/components/main-nav.tsx b/components/main-nav.tsx
index a13916b..f55ccc1 100644
--- a/components/main-nav.tsx
+++ b/components/main-nav.tsx
@@ -3,10 +3,9 @@
 import { useContext } from "react"
 import Link from "next/link"
 import { usePathname } from "next/navigation"
+import { useAppContext } from "@/context/AppContext"
 import { Home, Settings } from "lucide-react"
 
-import { NavItem } from "@/types/nav"
-import { cn } from "@/lib/utils"
 import { Button } from "@/components/ui/button"
 import {
   NavigationMenu,
@@ -24,11 +23,10 @@ import {
   SheetTrigger,
 } from "@/components/ui/sheet"
 import Transactions from "@/components/transactions"
-import { AppContext } from "@/app/index"
 
 export function MainNav() {
   const pathname = usePathname()
-  const { cctxs } = useContext(AppContext)
+  const { cctxs } = useAppContext()
 
   const inProgress =
     cctxs.filter(
@@ -43,10 +41,9 @@ export function MainNav() {
           <NavigationMenuItem>
             <Link href="/" legacyBehavior passHref>
               <NavigationMenuLink
-                className={cn(
-                  navigationMenuTriggerStyle(),
+                className={`${navigationMenuTriggerStyle()} ${
                   pathname === "/" ? "bg-accent" : ""
-                )}
+                }`}
               >
                 <Home className="mr-1 h-4 w-4" />
                 Home
@@ -58,7 +55,7 @@ export function MainNav() {
               <SheetTrigger asChild>
                 <Button variant="ghost" size="icon">
                   <Settings
-                    className={cn("h-4 w-4", inProgress && "animate-spin")}
+                    className={`h-4 w-4 ${inProgress && "animate-spin"}`}
                   />
                 </Button>
               </SheetTrigger>
diff --git a/components/site-header.tsx b/components/site-header.tsx
index fe8938f..a2786dd 100644
--- a/components/site-header.tsx
+++ b/components/site-header.tsx
@@ -1,8 +1,8 @@
 import { useContext } from "react"
+import { AppProvider } from "@/context/AppContext"
 import { ConnectButton } from "@rainbow-me/rainbowkit"
 import { Bitcoin } from "lucide-react"
 
-import { cn } from "@/lib/utils"
 import { Button } from "@/components/ui/button"
 import {
   Tooltip,
@@ -11,10 +11,9 @@ import {
   TooltipTrigger,
 } from "@/components/ui/tooltip"
 import { MainNav } from "@/components/main-nav"
-import { AppContext } from "@/app/index"
 
 export function SiteHeader() {
-  const { bitcoinAddress, connectBitcoin } = useContext(AppContext)
+  // const { bitcoinAddress, connectBitcoin } = useContext(AppContext)
 
   return (
     <header className="bg-background sticky top-0 z-40 w-full">
@@ -22,21 +21,16 @@ export function SiteHeader() {
         <MainNav />
         <div className="flex flex-1 items-center justify-end space-x-4">
           <nav className="flex items-center space-x-1">
-            <TooltipProvider>
+            {/* <TooltipProvider>
               <Tooltip>
                 <TooltipTrigger asChild>
                   <Button
                     size="icon"
-                    className={cn(
-                      "mx-2 bg-white hover:bg-white rounded-xl shadow-rainbowkit hover:scale-1025 transition-all active:scale-95"
-                    )}
+                    className={"mx-2 bg-white hover:bg-white rounded-xl shadow-rainbowkit hover:scale-1025 transition-all active:scale-95"}
                     onClick={() => connectBitcoin()}
                   >
                     <div
-                      className={cn(
-                        "rounded-full p-0.5",
-                        bitcoinAddress ? "bg-bitcoin" : "bg-gray-500"
-                      )}
+                      className={`rounded-full p-0.5 ${bitcoinAddress ? "bg-bitcoin" : "bg-gray-500"}`}
                     >
                       <Bitcoin className="w-5 h-5" color="white" />
                     </div>
@@ -48,7 +42,7 @@ export function SiteHeader() {
                   </TooltipContent>
                 )}
               </Tooltip>
-            </TooltipProvider>
+            </TooltipProvider> */}
             <ConnectButton
               chainStatus="icon"
               accountStatus={{
diff --git a/components/transfer.tsx b/components/swap.tsx
similarity index 65%
rename from components/transfer.tsx
rename to components/swap.tsx
index e8c92f6..bd1ef77 100644
--- a/components/transfer.tsx
+++ b/components/swap.tsx
@@ -1,16 +1,15 @@
 "use client"
 
-import { useCallback, useContext, useEffect, useState } from "react"
+import { useEffect, useState } from "react"
+import { useAppContext } from "@/context/AppContext"
 import ERC20_ABI from "@openzeppelin/contracts/build/contracts/ERC20.json"
-import UniswapV2Factory from "@uniswap/v2-periphery/build/IUniswapV2Router02.json"
-import { getEndpoints } from "@zetachain/networks/dist/src/getEndpoints"
 import { getAddress } from "@zetachain/protocol-contracts"
 import ERC20Custody from "@zetachain/protocol-contracts/abi/evm/ERC20Custody.sol/ERC20Custody.json"
 import WETH9 from "@zetachain/protocol-contracts/abi/zevm/WZETA.sol/WETH9.json"
-import ZRC20 from "@zetachain/protocol-contracts/abi/zevm/ZRC20.sol/ZRC20.json"
-import { prepareData } from "@zetachain/toolkit/client"
+import { ZetaChainClient, prepareData } from "@zetachain/toolkit/client"
 import { bech32 } from "bech32"
 import { ethers, utils } from "ethers"
+import debounce from "lodash/debounce"
 import {
   AlertCircle,
   Check,
@@ -23,8 +22,9 @@ import {
 import { parseEther, parseUnits } from "viem"
 import { useAccount, useNetwork, useSwitchNetwork } from "wagmi"
 
-import { useEthersSigner } from "@/lib/ethers"
 import { cn } from "@/lib/utils"
+import { useEthersSigner } from "@/hooks/useEthersSigner"
+import { useZetaChainClient } from "@/hooks/useZetaChainClient"
 import { Button } from "@/components/ui/button"
 import {
   Command,
@@ -39,16 +39,44 @@ import {
   PopoverContent,
   PopoverTrigger,
 } from "@/components/ui/popover"
-import { useZetaChain } from "@/app/ZetaChainContext"
-import { AppContext } from "@/app/index"
 
-const Transfer = () => {
-  const { client } = useZetaChain()
+import SwapToAnyToken from "./SwapToAnyToken.json"
+
+const roundToSignificantDigits = (
+  value: number,
+  significantDigits: number
+): number => {
+  if (value === 0) return 0
+  const digits =
+    -Math.floor(Math.log10(Math.abs(value))) + (significantDigits - 1)
+  const factor = 10 ** digits
+  return Math.round(value * factor) / factor
+}
+
+const roundNumber = (value: number): number => {
+  if (value >= 1) {
+    return parseFloat(value.toFixed(1))
+  }
+  return roundToSignificantDigits(value, 2)
+}
+
+const formatAddress = (address: any) => {
+  return `${address.slice(0, 4)}...${address.slice(-4)}`
+}
+
+const Swap = () => {
+  const { client } = useZetaChainClient()
   const omnichainSwapContractAddress =
-    "0x102Fa443F05200bB74aBA1c1F15f442DbEf32fFb"
+    "0xb459F14260D1dc6484CE56EB0826be317171e91F"
   const { isLoading, pendingChainId, switchNetwork } = useSwitchNetwork()
-  const { balances, bitcoinAddress, setInbounds, inbounds, fees } =
-    useContext(AppContext)
+  const {
+    balances,
+    balancesLoading,
+    bitcoinAddress,
+    setInbounds,
+    inbounds,
+    fees,
+  } = useAppContext()
   const { chain } = useNetwork()
 
   const signer = useEthersSigner()
@@ -67,7 +95,6 @@ const Transfer = () => {
     useState(false)
   const [destinationBalances, setDestinationBalances] = useState<any>()
   const [isRightChain, setIsRightChain] = useState(true)
-  const [sendType, setSendType] = useState<any>()
   const [crossChainFee, setCrossChainFee] = useState<any>()
   const [isSending, setIsSending] = useState(false)
   const [addressSelected, setAddressSelected] = useState<any>(null)
@@ -82,6 +109,92 @@ const Transfer = () => {
   const [isFeeOpen, setIsFeeOpen] = useState(false)
   const [sendButtonText, setSendButtonText] = useState("Send tokens")
 
+  const computeSendType = (s: any, d: any) => {
+    if (!s || !d) return null
+
+    const fromZETA = /\bzeta\b/i.test(s?.symbol)
+    const fromZETAorWZETA = /\bw?zeta\b/i.test(s?.symbol)
+    const fromZetaChain = s.chain_name === "zeta_testnet"
+    const fromBTC = s.symbol === "tBTC"
+    const fromBitcoin = s.chain_name === "btc_testnet"
+    const fromWZETA = s.symbol === "WZETA"
+    const fromGas = s.coin_type === "Gas"
+    const fromERC20 = s.coin_type === "ERC20"
+    const toZETAorWZETA = /\bw?zeta\b/i.test(d?.symbol)
+    const toWZETA = d.symbol === "WZETA"
+    const toZETA = d.symbol === "ZETA"
+    const toZetaChain = d.chain_name === "zeta_testnet"
+    const toGas = d.coin_type === "Gas"
+    const toERC20 = d.coin_type === "ERC20"
+    const toZRC20 = d.coin_type === "ZRC20"
+    const fromZRC20 = s.coin_type === "ZRC20"
+    const toBitcoin = d.chain_name === "btc_testnet"
+    const sameToken = s.ticker === d.ticker
+    const sameChain = s.chain_name === d.chain_name
+    const fromToBitcoin = fromBitcoin && toBitcoin
+    const fromToZetaChain = fromZetaChain || toZetaChain
+    const fromToZETAorWZETA = fromZETAorWZETA || toZETAorWZETA
+
+    const conditions = {
+      crossChainZeta: () => fromZETAorWZETA && toZETAorWZETA && !sameChain,
+      wrapZeta: () => fromZETA && toWZETA,
+      unwrapZeta: () => fromWZETA && toZETA,
+      depositNative: () =>
+        sameToken &&
+        !fromZetaChain &&
+        toZetaChain &&
+        fromGas &&
+        toZRC20 &&
+        !fromBTC,
+      depositERC20: () =>
+        sameToken &&
+        !fromZetaChain &&
+        toZetaChain &&
+        fromERC20 &&
+        toZRC20 &&
+        !fromBTC &&
+        s.zrc20 === d.contract,
+      withdrawZRC20: () =>
+        sameToken && fromZetaChain && !toZetaChain && !fromBTC,
+      transferNativeEVM: () =>
+        sameToken && sameChain && fromGas && toGas && !fromToBitcoin,
+      transferERC20EVM: () =>
+        sameToken &&
+        sameChain &&
+        ((fromERC20 && toERC20) || (fromZRC20 && toZRC20)) &&
+        !fromToBitcoin,
+      crossChainSwap: () =>
+        !fromToZetaChain && !fromToZETAorWZETA && !sameChain && !fromBTC,
+      // crossChainSwapBTC: () =>
+      //   fromBTC && !toBitcoin && !fromToZetaChain && !toZETAorWZETA,
+      // crossChainSwapBTCTransfer: () =>
+      //   fromBTC && !fromZetaChain && toZetaChain && toZRC20,
+      crossChainSwapTransfer: () =>
+        !fromZetaChain &&
+        toZetaChain &&
+        (toZRC20 || toZETA) &&
+        !fromZETAorWZETA,
+      // transferBTC: () => fromToBitcoin,
+      // depositBTC: () => fromBTC && !fromZetaChain && toZetaChain,
+      // withdrawBTC: () => fromBTC && fromZetaChain && !toZetaChain,
+      fromZetaChainSwapAndWithdraw: () =>
+        fromZetaChain && !toZetaChain && !toZETAorWZETA && (toERC20 || toGas),
+      fromZetaChainSwap: () =>
+        fromZetaChain &&
+        toZetaChain &&
+        !(fromWZETA || toWZETA) &&
+        (toZRC20 || toZETA),
+    }
+
+    const result = Object.entries(conditions).find(([_, check]) => check())
+    return result ? result[0] : null
+  }
+
+  const sendType = computeSendType(
+    sourceTokenSelected,
+    destinationTokenSelected
+  )
+
   const [errors, setErrors] = useState<any>({
     sendTypeUnsupported: {
       message: "Transfer type not supported",
@@ -113,6 +226,11 @@ const Transfer = () => {
       enabled: false,
       priority: 0,
     },
+    insufficientLiquidity: {
+      message: "Insufficient liquidity",
+      enabled: false,
+      priority: 0,
+    },
   })
 
   const priorityErrors = Object.entries(errors)
@@ -122,10 +240,6 @@ const Transfer = () => {
 
   const { address } = useAccount()
 
-  const formatAddress = (address: any) => {
-    return `${address.slice(0, 4)}...${address.slice(-4)}`
-  }
-
   // Set source token details
   useEffect(() => {
     const token = sourceBalances?.find((b: any) => b.id === sourceToken)
@@ -138,136 +252,197 @@ const Transfer = () => {
     setDestinationTokenSelected(token ? token : false)
   }, [destinationToken])
 
-  // Set cross-chain fee and whether address can be changed
   useEffect(() => {
-    if (fees) {
-      if (sendType === "crossChainZeta") {
-        const dest = destinationTokenSelected?.chain_name
-        const isZeta = dest === "zeta_testnet"
-        const amount = isZeta
-          ? 0
-          : parseFloat(fees?.["feesCCM"][dest]?.totalFee)
-        const formatted = amount === 0 ? "0 ZETA" : `~${amount.toFixed(2)} ZETA`
-        setCrossChainFee({
-          amount,
-          symbol: "ZETA",
-          formatted,
-        })
-      } else if (["crossChainSwap", "crossChainSwapBTC"].includes(sendType)) {
-        const fee =
-          fees?.["feesZEVM"][destinationTokenSelected?.chain_name]?.totalFee
-        const amount = parseFloat(fee)
-        const symbol = balances.find((c: any) => {
-          if (
-            c?.chain_id === destinationTokenSelected?.chain_id &&
-            c?.coin_type === "Gas"
-          ) {
-            return c
-          }
-        })?.symbol
-        setCrossChainFee({
-          amount,
-          symbol,
-          formatted: `~${amount.toFixed(2)} ${symbol}`,
-        })
-      } else {
-        setCrossChainFee(null)
+    const fetchCrossChainFee = async () => {
+      setCrossChainFee(null)
+      const fee = await getCrossChainFee(
+        sourceTokenSelected,
+        destinationTokenSelected
+      )
+      setCrossChainFee(fee)
+    }
+    fetchCrossChainFee()
+  }, [sourceTokenSelected, destinationTokenSelected])
+
+  const getCrossChainFee = async (s: any, d: any) => {
+    if (!sendType) return
+    if (["crossChainZeta"].includes(sendType)) {
+      if (!fees) return
+      const dest = d?.chain_name
+      const toZetaChain = dest === "zeta_testnet"
+      const fee = fees["messaging"].find((f: any) => f.chainID === d.chain_id)
+      const amount = toZetaChain ? 0 : parseFloat(fee.totalFee)
+      const formatted =
+        amount === 0 ? "Fee: 0 ZETA" : `Fee: ~${roundNumber(amount)} ZETA`
+      return {
+        amount,
+        decimals: 18,
+        symbol: "ZETA",
+        formatted,
       }
     }
+    if (
+      [
+        "withdrawZRC20",
+        "crossChainSwap",
+        "fromZetaChainSwapAndWithdraw",
+      ].includes(sendType)
+    ) {
+      const st = s.coin_type === "ZRC20" ? s.contract : s.zrc20
+      const dt = d.coin_type === "ZRC20" ? d.contract : d.zrc20
+      if (st && dt) {
+        let fee
+        try {
+          fee = await client.getWithdrawFeeInInputToken(st, dt)
+        } catch (error) {
+          console.error("Error fetching withdraw fee:", error)
+          return null
+        }
+        const feeAmount = roundNumber(
+          parseFloat(utils.formatUnits(fee.amount, fee.decimals))
+        )
+        return {
+          amount: utils.formatUnits(fee.amount, fee.decimals),
+          symbol: s.symbol,
+          decimals: fee.decimals,
+          formatted: `Fee: ${feeAmount} ${s.symbol}`,
+        }
+      }
+    }
+  }
 
+  // Set whether address can be changed
+  useEffect(() => {
     setCanChangeAddress(
       [
         "transferNativeEVM",
         "transferERC20EVM",
         "crossChainSwap",
         "transferBTC",
-      ].includes(sendType)
+      ].includes(sendType as any)
     )
   }, [sourceAmount, sendType, destinationTokenSelected])
 
-  // Set destination amount for a cross-chain swap
-  const getQuoteCrossChainSwap = useCallback(async () => {
-    if (
-      sourceAmount &&
-      parseFloat(sourceAmount) > 0 &&
-      (destinationTokenSelected?.zrc20 ||
-        (destinationTokenSelected?.coin_type === "ZRC20" &&
-          destinationTokenSelected?.contract)) &&
-      sourceTokenSelected?.zrc20
-    ) {
-      parseFloat(sourceAmount) > 0 && setDestinationAmountIsLoading(true)
-      const rpc = getEndpoints("evm", "zeta_testnet")[0]?.url
-      const provider = new ethers.providers.StaticJsonRpcProvider(rpc)
-      const routerAddress = getAddress("uniswapV2Router02", "zeta_testnet")
-      const router = new ethers.Contract(
-        routerAddress as any,
-        UniswapV2Factory.abi,
-        provider
-      )
-
-      const amountIn = ethers.utils.parseEther(sourceAmount)
-      const zetaToken = "0x5F0b1a82749cb4E2278EC87F8BF6B618dC71a8bf"
-      const srcToken = sourceTokenSelected.zrc20
-      const dstToken =
-        destinationTokenSelected.coin_type === "ZRC20"
-          ? destinationTokenSelected.contract
-          : destinationTokenSelected.zrc20
-      let zetaOut
+  // Set destination amount
+  useEffect(() => {
+    setDestinationAmount("")
+    updateError("insufficientLiquidity", { enabled: false })
+    const fetchQuoteCrossChain = async (
+      s: any,
+      d: any,
+      sourceAmount: any,
+      withdraw: boolean
+    ) => {
+      setDestinationAmount("")
+      setDestinationAmountIsLoading(true)
       try {
-        zetaOut = await router.getAmountsOut(
-          parseUnits(sourceAmount, sourceTokenSelected.decimals),
-          [srcToken, zetaToken]
-        )
+        const quote = await getQuoteCrossChain(s, d, sourceAmount, withdraw)
+        if (quote) {
+          setDestinationAmount(roundNumber(parseFloat(quote)).toString())
+          setDestinationAmountIsLoading(false)
+        }
       } catch (e) {
         console.error(e)
-      }
-      let dstOut
-      try {
-        dstOut = await router.getAmountsOut(zetaOut[1], [zetaToken, dstToken])
+        updateError("insufficientLiquidity", { enabled: true })
         setDestinationAmountIsLoading(false)
-        setDestinationAmount(
-          parseFloat(
-            ethers.utils.formatUnits(
-              dstOut[1],
-              destinationTokenSelected.decimals
-            )
-          ).toFixed(2)
-        )
-      } catch (e) {
-        console.error(e)
       }
     }
-  }, [sourceAmount, sourceTokenSelected, destinationTokenSelected, sendType])
-
-  // Set destination amount
-  useEffect(() => {
-    const st = calculateSendType()
-    setDestinationAmount("")
+    const debouncedFetchQuoteCrossChain = debounce(fetchQuoteCrossChain, 500)
+    if (!sendType) {
+      setDestinationAmountIsLoading(false)
+      return
+    }
     if (
       [
         "crossChainSwap",
         "crossChainSwapBTC",
-        "crossChainSwapBTCTransfer",
-        "crossChainSwapTransfer",
-      ].includes(st)
+        "fromZetaChainSwapAndWithdraw",
+      ].includes(sendType)
     ) {
-      getQuoteCrossChainSwap()
-      return
-    } else if (["crossChainZeta"].includes(st)) {
+      debouncedFetchQuoteCrossChain(
+        sourceTokenSelected,
+        destinationTokenSelected,
+        sourceAmount,
+        true
+      )
+    } else if (
+      ["crossChainSwapBTCTransfer", "crossChainSwapTransfer"].includes(sendType)
+    ) {
+      debouncedFetchQuoteCrossChain(
+        sourceTokenSelected,
+        destinationTokenSelected,
+        sourceAmount,
+        false
+      )
+    } else if (["crossChainZeta"].includes(sendType)) {
       const delta = parseFloat(sourceAmount) - crossChainFee?.amount
       if (sourceAmount && delta > 0) {
         setDestinationAmount(delta.toFixed(2).toString())
       }
+    } else if (["fromZetaChainSwap"].includes(sendType)) {
+      debouncedFetchQuoteCrossChain(
+        sourceTokenSelected,
+        destinationTokenSelected,
+        sourceAmount,
+        false
+      )
+    } else {
+      setDestinationAmount(sourceAmount)
+    }
+    return () => {
+      debouncedFetchQuoteCrossChain.cancel()
     }
-    setDestinationAmountIsLoading(false)
   }, [
-    sourceAmount,
     sourceTokenSelected,
     destinationTokenSelected,
+    sourceAmount,
     crossChainFee,
-    sendType,
   ])
 
+  const getQuoteCrossChain = async (
+    s: any,
+    d: any,
+    sourceAmount: any,
+    withdraw: boolean
+  ) => {
+    const dIsZRC20 = d?.zrc20 || (d?.coin_type === "ZRC20" && d?.contract)
+    const isAmountValid = sourceAmount && parseFloat(sourceAmount)
+    const WZETA = balances.find((b: any) => b.id === "7001__wzeta")
+    const dIsZETA = d.coin_type === "Gas" && d.chain_id === 7001
+    const sIsZETA = s.coin_type === "Gas" && d.chain_id === 7001
+    let sourceAddress
+    if (s.coin_type === "ZRC20") {
+      sourceAddress = s.contract
+    } else if (sIsZETA) {
+      sourceAddress = WZETA.contract
+    } else {
+      sourceAddress = s.zrc20
+    }
+    if (!isAmountValid) return "0"
+    if (isAmountValid > 0 && (dIsZRC20 || dIsZETA) && sourceAddress) {
+      let amount
+      if (withdraw && crossChainFee) {
+        const AmountMinusFee = utils
+          .parseUnits(sourceAmount, sourceTokenSelected.decimals)
+          .sub(utils.parseUnits(crossChainFee.amount, crossChainFee.decimals))
+
+        amount = utils.formatUnits(AmountMinusFee, sourceTokenSelected.decimals)
+      } else {
+        amount = sourceAmount
+      }
+      const target = d.coin_type === "ZRC20" ? d.contract : d.zrc20
+      const dAddress = dIsZETA ? WZETA.contract : target
+      let q
+      try {
+        q = await client.getQuote(amount, sourceAddress, dAddress)
+      } catch (error) {
+        console.error("Error fetching quote:", error)
+        return "0"
+      }
+      return utils.formatUnits(q.amount, q.decimals)
+    }
+  }
+
   const updateError = (errorKey: any, update: any) => {
     setErrors((prevErrors: any) => ({
       ...prevErrors,
@@ -309,13 +484,14 @@ const Transfer = () => {
   useEffect(() => {
     const am = parseFloat(sourceAmount || "0")
     const ltBalance = am >= 0 && am <= parseFloat(sourceTokenSelected?.balance)
-    if (["crossChainZeta"].includes(sendType)) {
+    if (["crossChainZeta"].includes(sendType as any)) {
       const gtFee = am > parseFloat(crossChainFee?.amount)
       setIsAmountGTFee(gtFee)
       setIsAmountLTBalance(ltBalance)
-    } else if (["crossChainSwap", "crossChainSwapBTC"].includes(sendType)) {
-      const gtFee =
-        parseFloat(destinationAmount) > parseFloat(crossChainFee?.amount)
+    } else if (
+      ["crossChainSwap", "crossChainSwapBTC"].includes(sendType as any)
+    ) {
+      const gtFee = parseFloat(sourceAmount) > parseFloat(crossChainFee?.amount)
       setIsAmountGTFee(gtFee)
       setIsAmountLTBalance(ltBalance)
     } else {
@@ -376,11 +552,14 @@ const Transfer = () => {
     !isAmountGTFee ||
     !isAmountLTBalance ||
     isSending ||
-    !isAddressSelectedValid
+    !isAddressSelectedValid ||
+    destinationAmountIsLoading ||
+    !destinationAmount ||
+    balancesLoading
 
   useEffect(() => {
-    if (destinationAmountIsLoading) {
-      setSendButtonText("Calculating...")
+    if (isSending) {
+      setSendButtonText("Sending...")
     } else if (sendDisabled && priorityErrors.length > 0) {
       setSendButtonText((priorityErrors as any)[0].message)
     } else {
@@ -423,85 +602,25 @@ const Transfer = () => {
     }
   }, [chain, sourceTokenSelected])
 
-  const calculateSendType = () => {
-    const s = sourceTokenSelected
-    const d = destinationTokenSelected
-    const t = (x: any) => {
-      setSendType(x)
-      return x
-    }
-    if (s && d) {
-      const fromZETA = /\bzeta\b/i.test(s?.symbol)
-      const fromZETAorWZETA = /\bw?zeta\b/i.test(s?.symbol)
-      const fromZetaChain = s.chain_name === "zeta_testnet"
-      const fromBTC = s.symbol === "tBTC"
-      const fromBitcoin = s.chain_name === "btc_testnet"
-      const fromWZETA = s.symbol === "WZETA"
-      const fromGas = s.coin_type === "Gas"
-      const fromERC20 = s.coin_type === "ERC20"
-      const toZETAorWZETA = /\bw?zeta\b/i.test(d?.symbol)
-      const toWZETA = d.symbol === "WZETA"
-      const toZETA = d.symbol === "ZETA"
-      const toZetaChain = d.chain_name === "zeta_testnet"
-      const toGas = d.coin_type === "Gas"
-      const toERC20 = d.coin_type === "ERC20"
-      const toZRC20 = d.coin_type === "ZRC20"
-      const toBitcoin = d.chain_name === "btc_testnet"
-      const sameToken = s.ticker === d.ticker
-      const sameChain = s.chain_name === d.chain_name
-      const fromToBitcoin = fromBitcoin && toBitcoin
-      const fromToZetaChain = fromZetaChain || toZetaChain
-      const fromToZETAorWZETA = fromZETAorWZETA || toZETAorWZETA
-
-      if (fromZETAorWZETA && toZETAorWZETA && !sameChain)
-        return t("crossChainZeta")
-      if (fromZETA && toWZETA) return t("wrapZeta")
-      if (fromWZETA && toZETA) return t("unwrapZeta")
-      if (
-        sameToken &&
-        !fromZetaChain &&
-        toZetaChain &&
-        fromGas &&
-        toZRC20 &&
-        !fromBTC
-      )
-        return t("depositNative")
-      if (
-        sameToken &&
-        !fromZetaChain &&
-        toZetaChain &&
-        fromERC20 &&
-        toZRC20 &&
-        !fromBTC &&
-        s.zrc20 === d.contract
-      )
-        return t("depositERC20")
-      if (sameToken && fromZetaChain && !toZetaChain && !fromBTC)
-        return t("withdrawZRC20")
-      if (sameToken && sameChain && fromGas && toGas && !fromToBitcoin)
-        return t("transferNativeEVM")
-      if (sameToken && sameChain && fromERC20 && toERC20 && !fromToBitcoin)
-        return t("transferERC20EVM")
-      if (!fromToZetaChain && !fromToZETAorWZETA && !sameChain && !fromBTC)
-        return t("crossChainSwap")
-      if (fromBTC && !toBitcoin && !fromToZetaChain && !toZETAorWZETA)
-        return t("crossChainSwapBTC")
-      if (fromBTC && !fromZetaChain && toZetaChain && toZRC20)
-        return t("crossChainSwapBTCTransfer")
-      if (!fromZetaChain && toZetaChain && toZRC20 && !fromToZETAorWZETA)
-        return t("crossChainSwapTransfer")
-      if (fromToBitcoin) return t("transferBTC")
-      if (fromBTC && !fromZetaChain && toZetaChain) return t("depositBTC")
-      if (fromBTC && fromZetaChain && !toZetaChain) return t("withdrawBTC")
-    }
-    t(null)
+  const sendTypeDetails: any = {
+    crossChainZeta: { title: "Transfer" },
+    wrapZeta: { title: "Wrap" },
+    unwrapZeta: { title: "Unwrap" },
+    depositNative: { title: "Deposit" },
+    depositERC20: { title: "Deposit" },
+    withdrawZRC20: { title: "Withdraw" },
+    transferNativeEVM: { title: "Send" },
+    transferERC20EVM: { title: "Send" },
+    crossChainSwap: { title: "Swap" },
+    crossChainSwapBTC: { title: "Swap" },
+    crossChainSwapBTCTransfer: { title: "Deposit and Swap" },
+    crossChainSwapTransfer: { title: "Deposit and Swap" },
+    transferBTC: { title: "Send" },
+    depositBTC: { title: "Deposit" },
+    withdrawBTC: { title: "Withdraw" },
+    fromZetaChainSwapAndWithdraw: { title: "Swap and Withdraw" },
   }
 
-  // Set send type
-  useEffect(() => {
-    calculateSendType()
-  }, [sourceTokenSelected, destinationTokenSelected])
-
   // Set source and destination balances
   useEffect(() => {
     setSourceBalances(
@@ -543,7 +662,7 @@ const Transfer = () => {
 
   let m = {} as any
 
-  m.crossChainSwapBTCHandle = (action: string) => {
+  m.crossChainSwapBTCHandle = ({ withdraw }: { withdraw: boolean }) => {
     if (!address) {
       console.error("EVM address undefined.")
       return
@@ -557,7 +676,9 @@ const Transfer = () => {
     const contract = omnichainSwapContractAddress.replace(/^0x/, "")
     const zrc20 = destinationTokenSelected.zrc20.replace(/^0x/, "")
     const dest = address.replace(/^0x/, "")
-    const memo = `hex::${contract}${action}${zrc20}${dest}`
+    // TODO: test with Bitcoin to see if this actually works
+    const withdrawFlag = withdraw ? "00" : "01"
+    const memo = `hex::${contract}${zrc20}${dest}${withdrawFlag}`
     window.xfi.bitcoin.request(
       bitcoinXDEFITransfer(bitcoinAddress, bitcoinTSSAddress, a, memo),
       (error: any, hash: any) => {
@@ -608,13 +729,12 @@ const Transfer = () => {
   m.crossChainZeta = async () => {
     const from = sourceTokenSelected.chain_name
     const to = destinationTokenSelected.chain_name
-    const tx = await client.sendZETA(
-      signer,
-      sourceAmount,
-      from,
-      to,
-      address as string
-    )
+    const tx = await client.sendZeta({
+      chain: from,
+      destination: to,
+      recipient: address as string,
+      amount: sourceAmount,
+    })
     const inbound = {
       inboundHash: tx.hash,
       desc: `Sent ${sourceAmount} ZETA from ${from} to ${to}`,
@@ -627,14 +747,11 @@ const Transfer = () => {
     const to = destinationTokenSelected.chain_name
     const btc = bitcoinAddress
     const token = sourceTokenSelected.symbol
-    const tx = await client.sendZRC20(
-      signer,
-      sourceAmount,
-      from,
-      to,
-      btc,
-      token
-    )
+    const tx = await client.deposit({
+      chain: from,
+      amount: sourceAmount,
+      recipient: addressSelected,
+    })
     const inbound = {
       inboundHash: tx.hash,
       desc: `Sent ${sourceAmount} ${token} from ${from} to ${to}`,
@@ -679,18 +796,16 @@ const Transfer = () => {
 
   m.withdrawZRC20 = async () => {
     const destination = destinationTokenSelected.chain_name
-    const ZRC20Address = getAddress("zrc20", destination)
-    const contract = new ethers.Contract(ZRC20Address as any, ZRC20.abi, signer)
-    const value = ethers.utils.parseUnits(
-      sourceAmount,
-      destinationTokenSelected.decimals
-    )
-    await contract.approve(ZRC20Address, value)
-    const to =
-      destination === "btc_testnet"
-        ? ethers.utils.toUtf8Bytes(bitcoinAddress)
-        : addressSelected
-    const tx = await contract.withdraw(to, value)
+    const zrc20 = getAddress("zrc20", destination)
+    if (!zrc20) {
+      console.error("ZRC-20 address not found")
+      return
+    }
+    const tx = await client.withdraw({
+      amount: sourceAmount,
+      zrc20,
+      recipient: addressSelected,
+    })
     const token = sourceTokenSelected.symbol
     const from = sourceTokenSelected.chain_name
     const dest = destinationTokenSelected.chain_name
@@ -705,21 +820,87 @@ const Transfer = () => {
     const from = sourceTokenSelected.chain_name
     const to = destinationTokenSelected.chain_name
     const token = sourceTokenSelected.symbol
-    const tx = await client.sendZRC20(
-      signer,
+    const tx = await client.deposit({
+      chain: from,
+      amount: sourceAmount,
+      recipient: addressSelected,
+    })
+    const inbound = {
+      inboundHash: tx.hash,
+      desc: `Sent ${sourceAmount} ${token} from ${from} to ${to}`,
+    }
+    setInbounds([...inbounds, inbound])
+  }
+
+  m.fromZetaChainSwapAndWithdraw = async () => {
+    const swapContract = new ethers.Contract(
+      omnichainSwapContractAddress,
+      SwapToAnyToken.abi,
+      signer
+    )
+    const amount = ethers.utils.parseUnits(
       sourceAmount,
-      from,
-      to,
-      address as string,
-      token
+      sourceTokenSelected.decimals
+    )
+    const sourceToken = sourceTokenSelected.contract
+    const destinationToken = destinationTokenSelected.zrc20
+    const erc20Contract = new ethers.Contract(
+      sourceToken,
+      ERC20_ABI.abi,
+      signer
+    )
+    const approve = await erc20Contract.approve(
+      omnichainSwapContractAddress,
+      amount
+    )
+    const recipient = ethers.utils.arrayify(addressSelected)
+    await approve.wait()
+    const tx = await swapContract.swap(
+      sourceToken,
+      amount,
+      destinationToken,
+      recipient,
+      true
     )
     const inbound = {
       inboundHash: tx.hash,
-      desc: `Sent ${sourceAmount} ${token} from ${from} to ${to}`,
+      desc: `Sent ${sourceAmount} ${sourceToken.symbol} from ZetaChain to ${destinationTokenSelected.chain_name}`,
     }
     setInbounds([...inbounds, inbound])
   }
 
+  m.fromZetaChainSwap = async () => {
+    const swapContract = new ethers.Contract(
+      omnichainSwapContractAddress,
+      SwapToAnyToken.abi,
+      signer
+    )
+    const amount = ethers.utils.parseUnits(
+      sourceAmount,
+      sourceTokenSelected.decimals
+    )
+    const sourceToken = sourceTokenSelected.contract
+    const destinationToken = destinationTokenSelected.contract
+    const erc20Contract = new ethers.Contract(
+      sourceToken,
+      ERC20_ABI.abi,
+      signer
+    )
+    const approve = await erc20Contract.approve(
+      omnichainSwapContractAddress,
+      amount
+    )
+    const recipient = ethers.utils.arrayify(addressSelected)
+    await approve.wait()
+    const tx = await swapContract.swap(
+      sourceToken,
+      amount,
+      destinationToken,
+      recipient,
+      false
+    )
+  }
+
   m.depositERC20 = async () => {
     const custodyAddress = getAddress(
       "erc20Custody",
@@ -770,7 +951,7 @@ const Transfer = () => {
     )
   }
 
-  m.crossChainSwapHandle = async (action: string) => {
+  m.crossChainSwapHandle = async ({ withdraw }: { withdraw: boolean }) => {
     const d = destinationTokenSelected
     const zrc20 = d.coin_type === "ZRC20" ? d.contract : d.zrc20
     let recipient
@@ -787,8 +968,8 @@ const Transfer = () => {
 
     const data = prepareData(
       omnichainSwapContractAddress,
-      ["uint8", "address", "bytes"],
-      [action, zrc20, recipient]
+      ["address", "bytes", "bool"],
+      [zrc20, recipient, withdraw]
     )
 
     const to = getAddress("tss", sourceTokenSelected.chain_name)
@@ -809,10 +990,11 @@ const Transfer = () => {
     }
   }
 
-  m.crossChainSwap = () => m.crossChainSwapHandle("1")
-  m.crossChainSwapTransfer = () => m.crossChainSwapHandle("2")
-  m.crossChainSwapBTC = () => m.crossChainSwapBTCHandle("01")
-  m.crossChainSwapBTCTransfer = () => m.crossChainSwapBTCHandle("02")
+  m.crossChainSwap = () => m.crossChainSwapHandle({ withdtaw: true })
+  m.crossChainSwapTransfer = () => m.crossChainSwapHandle({ withdraw: false })
+  m.crossChainSwapBTC = () => m.crossChainSwapBTCHandle({ withdraw: true })
+  m.crossChainSwapBTCTransfer = () =>
+    m.crossChainSwapBTCHandle({ withdraw: false })
 
   const handleSend = async () => {
     setIsSending(true)
@@ -842,7 +1024,7 @@ const Transfer = () => {
   return (
     <div className="shadow-none md:shadow-xl p-0 md:px-5 md:py-7 rounded-2xl md:shadow-gray-100 mb-10">
       <h1 className="text-2xl font-bold leading-tight tracking-tight mt-6 mb-4 ml-2">
-        Swap
+        {sendTypeDetails[sendType as any]?.title || "Swap"}
       </h1>
       <form
         onSubmit={(e) => {
@@ -855,7 +1037,7 @@ const Transfer = () => {
             onChange={(e) => setSourceAmount(e.target.value)}
             placeholder="0"
             value={sourceAmount}
-            disabled={isSending}
+            disabled={isSending || balancesLoading}
             type="number"
             step="any"
           />
@@ -864,8 +1046,9 @@ const Transfer = () => {
               <Button
                 variant="outline"
                 role="combobox"
+                disabled={balancesLoading}
                 aria-expanded={sourceTokenOpen}
-                className="justify-between col-span-2 h-full overflow-x-hidden border-none"
+                className="justify-between col-span-2 text-left h-full overflow-x-hidden border-none"
               >
                 <div className="flex flex-col w-full items-start">
                   <div className="text-xs w-full flex justify-between">
@@ -882,7 +1065,7 @@ const Transfer = () => {
                   <div className="text-xs text-slate-400">
                     {sourceTokenSelected
                       ? sourceTokenSelected.chain_name
-                      : "Select token"}
+                      : "Send token"}
                   </div>
                 </div>
                 <ChevronDown className="ml-2 h-4 w-4 shrink-0 opacity-75" />
@@ -891,7 +1074,7 @@ const Transfer = () => {
             <PopoverContent className="w-[300px] p-0 border-none shadow-2xl">
               <Command>
                 <CommandInput placeholder="Search tokens..." />
-                <CommandEmpty>No balances found.</CommandEmpty>
+                <CommandEmpty>No available tokens found.</CommandEmpty>
                 <CommandGroup className="max-h-[400px] overflow-y-scroll">
                   {sourceBalances?.map((balances: any) => (
                     <CommandItem
@@ -904,12 +1087,11 @@ const Transfer = () => {
                       }}
                     >
                       <Check
-                        className={cn(
-                          "mr-2 h-4 w-4",
+                        className={`mr-2 h-4 w-4 ${
                           sourceToken === balances.id
                             ? "opacity-100"
                             : "opacity-0"
-                        )}
+                        }`}
                       />
                       <div className="w-full">
                         <div className="flex justify-between">
@@ -950,8 +1132,9 @@ const Transfer = () => {
               <Button
                 variant="outline"
                 role="combobox"
+                disabled={balancesLoading}
                 aria-expanded={sourceTokenOpen}
-                className="justify-between col-span-2 h-full overflow-x-hidden border-none"
+                className="justify-between text-left col-span-2 h-full overflow-x-hidden border-none"
               >
                 <div className="flex flex-col w-full items-start">
                   <div className="text-xs">
@@ -962,7 +1145,7 @@ const Transfer = () => {
                   <div className="text-xs text-slate-400">
                     {destinationTokenSelected
                       ? destinationTokenSelected.chain_name
-                      : "Select token"}
+                      : "Receive token"}
                   </div>
                 </div>
                 <ChevronDown className="ml-2 h-4 w-4 shrink-0 opacity-75" />
@@ -971,25 +1154,28 @@ const Transfer = () => {
             <PopoverContent className="w-[300px] p-0 border-none shadow-2xl">
               <Command>
                 <CommandInput placeholder="Search tokens..." />
-                <CommandEmpty>No balances found.</CommandEmpty>
+                <CommandEmpty>No available tokens found.</CommandEmpty>
                 <CommandGroup className="max-h-[400px] overflow-y-scroll">
                   {destinationBalances?.map((balances: any) => (
                     <CommandItem
                       key={balances.id}
-                      className="hover:cursor-pointer"
+                      className={`hover:cursor-pointer ${
+                        !computeSendType(sourceTokenSelected, balances) &&
+                        "opacity-25"
+                      }`}
                       value={balances.id}
+                      disabled={!computeSendType(sourceTokenSelected, balances)}
                       onSelect={(c) => {
                         setDestinationToken(c === destinationToken ? null : c)
                         setDestinationTokenOpen(false)
                       }}
                     >
                       <Check
-                        className={cn(
-                          "mr-2 h-4 w-4",
+                        className={`mr-2 h-4 w-4 ${
                           destinationToken === balances.id
                             ? "opacity-100"
                             : "opacity-0"
-                        )}
+                        }`}
                       />
                       <div className="w-full">
                         <div className="flex justify-between">
@@ -1017,17 +1203,17 @@ const Transfer = () => {
                 <Button
                   disabled={!canChangeAddress}
                   variant="outline"
-                  className="rounded-full w-[110px] text-xs h-6 px-3"
+                  className="rounded-full text-xs h-6 px-2"
                 >
                   {isAddressSelectedValid ? (
                     <UserCircle2 className="h-3 w-3 mr-1" />
                   ) : (
                     <AlertCircle className="h-3 w-3 mr-1" />
                   )}
-                  {formatAddress(addressSelected)}
+                  <div>{formatAddress(addressSelected)}</div>
                 </Button>
               </PopoverTrigger>
-              <PopoverContent className="rounded-xl flex p-2 space-x-2 w-[390px]">
+              <PopoverContent className="rounded-xl flex p-2 border-none shadow-xl space-x-2 w-[390px]">
                 <Input
                   className="grow border-none text-xs px-2"
                   placeholder="Recipient address"
@@ -1053,16 +1239,14 @@ const Transfer = () => {
                 <Button
                   // disabled={true}
                   variant="outline"
-                  className="rounded-full text-xs h-6 px-3"
+                  className="rounded-full text-xs h-6 px-3 whitespace-nowrap overflow-hidden"
                 >
                   {crossChainFee.formatted}
                 </Button>
               </PopoverTrigger>
-              <PopoverContent className="rounded-xl w-auto text-xs">
+              <PopoverContent className="rounded-xl w-auto text-xs border-none shadow-2xl">
                 <div className="font-medium text-center">Cross-Chain Fee</div>
-                <div className="text-slate-400">
-                  {crossChainFee?.amount.toFixed(15)}
-                </div>
+                <div className="text-slate-400">{crossChainFee?.amount}</div>
               </PopoverContent>
             </Popover>
           )}
@@ -1106,4 +1290,4 @@ const Transfer = () => {
   )
 }
 
-export default Transfer
+export default Swap
diff --git a/components/transactions.tsx b/components/transactions.tsx
index bd0bc08..9d861d2 100644
--- a/components/transactions.tsx
+++ b/components/transactions.tsx
@@ -1,15 +1,15 @@
 "use client"
 
 import { useContext } from "react"
+import { useAppContext } from "@/context/AppContext"
 import { AlertTriangle, CheckCircle2, Loader2 } from "lucide-react"
 
 import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert"
 import { Card } from "@/components/ui/card"
 import { Table, TableBody, TableCell, TableRow } from "@/components/ui/table"
-import { AppContext } from "@/app/index"
 
 const TransactionsPage = () => {
-  const { cctxs } = useContext(AppContext)
+  const { cctxs } = useAppContext()
 
   const inProgress = (status: string): boolean => {
     return !(status === "mined-success" || status === "mined-fail")
diff --git a/config/site.ts b/config/site.ts
deleted file mode 100644
index 7bddefb..0000000
--- a/config/site.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export type SiteConfig = typeof siteConfig
-
-export const siteConfig = {
-  name: "ZetaChain's Frontend Template",
-  description: "",
-}
diff --git a/context/AppContext.tsx b/context/AppContext.tsx
new file mode 100644
index 0000000..248a25d
--- /dev/null
+++ b/context/AppContext.tsx
@@ -0,0 +1,414 @@
+import {
+  createContext,
+  useCallback,
+  useContext,
+  useEffect,
+  useState,
+} from "react"
+import { EvmPriceServiceConnection } from "@pythnetwork/pyth-evm-js"
+import { getEndpoints } from "@zetachain/networks/dist/src/getEndpoints"
+import EventEmitter from "eventemitter3"
+// @ts-ignore
+import Cookies from "js-cookie"
+import debounce from "lodash/debounce"
+import { useAccount } from "wagmi"
+
+import { hexToBech32Address } from "@/lib/hexToBech32Address"
+import { useZetaChainClient } from "@/hooks/useZetaChainClient"
+import { useToast } from "@/components/ui/use-toast"
+
+const AppContext = createContext<any>(null)
+
+export const AppProvider = ({ children }: { children: React.ReactNode }) => {
+  const { client } = useZetaChainClient()
+  const { address, isConnected } = useAccount()
+  const [balances, setBalances] = useState<any>([])
+  const [balancesLoading, setBalancesLoading] = useState(true)
+  const [balancesRefreshing, setBalancesRefreshing] = useState(false)
+  const [bitcoinAddress, setBitcoinAddress] = useState("")
+  const [fees, setFees] = useState<any>([])
+  const [pools, setPools] = useState<any>([])
+  const [poolsLoading, setPoolsLoading] = useState(false)
+  const [validators, setValidators] = useState<any>([])
+  const [validatorsLoading, setValidatorsLoading] = useState(false)
+  const [stakingDelegations, setStakingDelegations] = useState<any>([])
+  const [stakingRewards, setStakingRewards] = useState<any>([])
+  const [unbondingDelegations, setUnbondingDelegations] = useState<any>([])
+  const [observers, setObservers] = useState<any>([])
+  const [prices, setPrices] = useState<any>([])
+  const { toast } = useToast()
+
+  const fetchObservers = useCallback(
+    debounce(async () => {
+      try {
+        const api = getEndpoints("cosmos-http", "zeta_testnet")[0]?.url
+        const url = `${api}/zeta-chain/observer/nodeAccount`
+        const response = await fetch(url)
+        const data = await response.json()
+        setObservers(data.NodeAccount)
+      } catch (e) {
+        console.error(e)
+      }
+    }, 500),
+    []
+  )
+
+  const fetchUnbondingDelegations = useCallback(
+    debounce(async () => {
+      try {
+        if (!isConnected) {
+          return setUnbondingDelegations([])
+        }
+        const api = getEndpoints("cosmos-http", "zeta_testnet")[0]?.url
+        const addr = hexToBech32Address(address as any, "zeta")
+        const url = `${api}/cosmos/staking/v1beta1/delegators/${addr}/unbonding_delegations`
+        const response = await fetch(url)
+        const data = await response.json()
+        setUnbondingDelegations(data.unbonding_responses)
+      } catch (e) {
+        console.error(e)
+      }
+    }, 500),
+    [address, isConnected]
+  )
+
+  const connectBitcoin = async () => {
+    const w = window as any
+    if ("xfi" in w && w.xfi?.bitcoin) {
+      w.xfi.bitcoin.changeNetwork("testnet")
+      const btc = (await w.xfi.bitcoin.getAccounts())[0]
+      await setBitcoinAddress(btc)
+      fetchBalances(true, btc)
+    }
+  }
+
+  const fetchStakingDelegations = useCallback(
+    debounce(async () => {
+      try {
+        if (!isConnected) {
+          return setStakingDelegations([])
+        }
+        const api = getEndpoints("cosmos-http", "zeta_testnet")[0]?.url
+        const addr = hexToBech32Address(address as any, "zeta")
+        const url = `${api}/cosmos/staking/v1beta1/delegations/${addr}`
+        const response = await fetch(url)
+        const data = await response.json()
+        setStakingDelegations(data.delegation_responses)
+      } catch (e) {
+        console.error(e)
+      }
+    }, 500),
+    [address, isConnected]
+  )
+
+  const fetchStakingRewards = useCallback(
+    debounce(async () => {
+      try {
+        if (!isConnected) {
+          return setStakingRewards([])
+        }
+        const api = getEndpoints("cosmos-http", "zeta_testnet")[0]?.url
+        const addr = hexToBech32Address(address as any, "zeta")
+        const url = `${api}/cosmos/distribution/v1beta1/delegators/${addr}/rewards`
+        const response = await fetch(url)
+        const data = await response.json()
+        setStakingRewards(data.rewards)
+      } catch (e) {
+        console.error(e)
+      }
+    }, 500),
+    [address, isConnected]
+  )
+
+  const fetchValidators = useCallback(
+    debounce(async () => {
+      setValidatorsLoading(true)
+      let allValidators: any[] = []
+      let nextKey: any = null
+
+      try {
+        if (!isConnected) {
+          setValidatorsLoading(false)
+          setValidators([])
+        }
+        const api = getEndpoints("cosmos-http", "zeta_testnet")[0]?.url
+
+        const fetchBonded = async () => {
+          const response = await fetch(`${api}/cosmos/staking/v1beta1/pool`)
+          const data = await response.json()
+          return data
+        }
+
+        const fetchPage = async (key: string) => {
+          const endpoint = "/cosmos/staking/v1beta1/validators"
+          const query = `pagination.key=${encodeURIComponent(key)}`
+          const url = `${api}${endpoint}?${key && query}`
+
+          const response = await fetch(url)
+          const data = await response.json()
+
+          allValidators = allValidators.concat(data.validators)
+
+          if (data.pagination && data.pagination.next_key) {
+            await fetchPage(data.pagination.next_key)
+          }
+        }
+        const pool = (await fetchBonded())?.pool
+        const tokens = parseInt(pool.bonded_tokens)
+        await fetchPage(nextKey)
+        allValidators = allValidators.map((v) => {
+          return {
+            ...v,
+            voting_power: tokens ? (parseInt(v.tokens) / tokens) * 100 : 0,
+          }
+        })
+      } catch (e) {
+        console.error(e)
+      } finally {
+        setValidators(allValidators)
+        setValidatorsLoading(false)
+      }
+    }, 500),
+    [address, isConnected]
+  )
+
+  const fetchBalances = useCallback(
+    debounce(async (refresh: Boolean = false, btc: any = null) => {
+      if (refresh) setBalancesRefreshing(true)
+      if (balances.length === 0) setBalancesLoading(true)
+      try {
+        if (!isConnected) {
+          return setBalances([])
+        }
+        const b = await client.getBalances({
+          evmAddress: address,
+          btcAddress: btc,
+        })
+        setBalances(b)
+      } catch (e) {
+        console.error(e)
+      } finally {
+        setBalancesRefreshing(false)
+        setBalancesLoading(false)
+      }
+    }, 500),
+    [isConnected, address]
+  )
+
+  const fetchFeesList = useCallback(
+    debounce(async () => {
+      try {
+        if (!isConnected) {
+          return setFees([])
+        }
+        setFees(await client.getFees(500000))
+      } catch (e) {
+        console.error(e)
+      }
+    }, 500),
+    []
+  )
+
+  const fetchPools = useCallback(
+    debounce(async () => {
+      setPoolsLoading(true)
+      try {
+        setPools(await client.getPools())
+      } catch (e) {
+        console.error(e)
+      } finally {
+        setPoolsLoading(false)
+      }
+    }, 500),
+    []
+  )
+
+  useEffect(() => {
+    fetchBalances(true)
+    fetchFeesList()
+    fetchStakingDelegations()
+    fetchPrices()
+  }, [isConnected, address])
+
+  const fetchPrices = useCallback(
+    debounce(async () => {
+      let priceIds: any = []
+      const api = getEndpoints("cosmos-http", "zeta_testnet")[0]?.url
+
+      const zetaChainUrl = `${api}/zeta-chain/fungible/foreign_coins`
+      const pythNetworkUrl = "https://benchmarks.pyth.network/v1/price_feeds/"
+
+      try {
+        const zetaResponse = await fetch(zetaChainUrl)
+        const zetaData = await zetaResponse.json()
+        const foreignCoins = zetaData.foreignCoins
+        const symbolsFromZeta = foreignCoins.map((coin: any) =>
+          coin.symbol.replace(/^[tg]/, "")
+        )
+
+        const pythResponse = await fetch(pythNetworkUrl)
+        const pythData = await pythResponse.json()
+        const priceFeeds = pythData
+
+        priceIds = priceFeeds
+          .filter((feed: any) => {
+            const base = symbolsFromZeta.includes(feed.attributes.base)
+            const quote = feed.attributes.quote_currency === "USD"
+            return base && quote
+          })
+          .map((feed: any) => ({
+            symbol: feed.attributes.base,
+            id: feed.id,
+          }))
+      } catch (error) {
+        console.error("Error fetching or processing data:", error)
+        return []
+      }
+      const connection = new EvmPriceServiceConnection(
+        "https://hermes.pyth.network"
+      )
+
+      const priceFeeds = await connection.getLatestPriceFeeds(
+        priceIds.map((p: any) => p.id)
+      )
+
+      setPrices(
+        priceFeeds?.map((p: any) => {
+          const pr = p.getPriceNoOlderThan(60)
+          return {
+            id: p.id,
+            symbol: priceIds.find((i: any) => i.id === p.id)?.symbol,
+            price: parseInt(pr.price) * 10 ** pr.expo,
+          }
+        })
+      )
+    }, 500),
+    []
+  )
+
+  const [inbounds, setInbounds] = useState<any>([])
+  const [cctxs, setCCTXs] = useState<any>([])
+
+  const updateCCTX = (updatedItem: any) => {
+    setCCTXs((prevItems: any) => {
+      const index = prevItems.findIndex(
+        (item: any) => item.inboundHash === updatedItem.inboundHash
+      )
+
+      if (index === -1) return prevItems
+
+      const newItems = [...prevItems]
+      newItems[index] = {
+        ...newItems[index],
+        ...updatedItem,
+      }
+
+      return newItems
+    })
+  }
+
+  useEffect(() => {
+    const cctxList = cctxs.map((c: any) => c.inboundHash)
+    for (let i of inbounds) {
+      if (!cctxList.includes(i.inboundHash)) {
+        const emitter = new EventEmitter()
+        emitter
+          .on("search-add", ({ text }) => {
+            updateCCTX({
+              inboundHash: i.inboundHash,
+              progress: text,
+              status: "searching",
+            })
+          })
+          .on("add", ({ text }) => {
+            updateCCTX({
+              inboundHash: i.inboundHash,
+              progress: text,
+              status: "searching",
+            })
+          })
+          .on("succeed", ({ text }) => {
+            updateCCTX({
+              inboundHash: i.inboundHash,
+              progress: text,
+              status: "succeed",
+            })
+          })
+          .on("fail", ({ text }) => {
+            updateCCTX({
+              inboundHash: i.inboundHash,
+              progress: text,
+              status: "failed",
+            })
+          })
+          .on("mined-success", (value) => {
+            updateCCTX({
+              inboundHash: i.inboundHash,
+              status: "mined-success",
+              ...value,
+            })
+          })
+          .on("mined-fail", (value) => {
+            updateCCTX({
+              inboundHash: i.inboundHash,
+              status: "mined-fail",
+              ...value,
+            })
+          })
+
+        client.trackCCTX(i.inboundHash, false, emitter)
+        setCCTXs([...cctxs, { inboundHash: i.inboundHash, desc: i.desc }])
+      }
+    }
+  }, [inbounds])
+
+  useEffect(() => {
+    if (!Cookies.get("firstTimeVisit")) {
+      toast({
+        title: "Welcome to ZetaChain Example App",
+        description: "This is a testnet. Please do not use real funds.",
+        duration: 60000,
+      })
+      Cookies.set("firstTimeVisit", "true", { expires: 7 })
+    }
+  }, [])
+
+  return (
+    <AppContext.Provider
+      value={{
+        cctxs,
+        inbounds,
+        balances,
+        bitcoinAddress,
+        balancesLoading,
+        balancesRefreshing,
+        fees,
+        connectBitcoin,
+        pools,
+        poolsLoading,
+        validators,
+        fetchValidators,
+        validatorsLoading,
+        stakingDelegations,
+        stakingRewards,
+        setCCTXs,
+        setInbounds,
+        setBitcoinAddress,
+        setBalances,
+        fetchPools,
+        fetchBalances,
+        fetchStakingDelegations,
+        fetchStakingRewards,
+        unbondingDelegations,
+        fetchUnbondingDelegations,
+        prices,
+        fetchObservers,
+        observers,
+      }}
+    >
+      {children}
+    </AppContext.Provider>
+  )
+}
+
+export const useAppContext = () => useContext(AppContext)
diff --git a/lib/ethers.ts b/hooks/useEthersSigner.ts
similarity index 62%
rename from lib/ethers.ts
rename to hooks/useEthersSigner.ts
index cbae96a..3cd39d9 100644
--- a/lib/ethers.ts
+++ b/hooks/useEthersSigner.ts
@@ -2,6 +2,12 @@ import * as React from "react"
 import { providers } from "ethers"
 import { useWalletClient, type WalletClient } from "wagmi"
 
+/**
+ * Converts a Wallet Client to an ethers.js Signer.
+ *
+ * @param {WalletClient} walletClient - The wallet client to convert.
+ * @returns {providers.JsonRpcSigner} - The ethers.js signer.
+ */
 export function walletClientToSigner(walletClient: WalletClient) {
   const { account, chain, transport } = walletClient
   const network = {
@@ -14,7 +20,13 @@ export function walletClientToSigner(walletClient: WalletClient) {
   return signer
 }
 
-/** Hook to convert a viem Wallet Client to an ethers.js Signer. */
+/**
+ * Hook to convert a viem Wallet Client to an ethers.js Signer.
+ *
+ * @param {object} options - The options object.
+ * @param {number} [options.chainId] - The chain ID to use.
+ * @returns {providers.JsonRpcSigner|undefined} - The ethers.js signer or undefined.
+ */
 export function useEthersSigner({ chainId }: { chainId?: number } = {}) {
   const { data: walletClient } = useWalletClient({ chainId })
   return React.useMemo(
diff --git a/hooks/useZetaChainClient.tsx b/hooks/useZetaChainClient.tsx
new file mode 100644
index 0000000..526c275
--- /dev/null
+++ b/hooks/useZetaChainClient.tsx
@@ -0,0 +1,60 @@
+import React, {
+  ReactNode,
+  createContext,
+  useCallback,
+  useContext,
+  useEffect,
+  useState,
+} from "react"
+import { ZetaChainClient } from "@zetachain/toolkit/client"
+
+import { useEthersSigner } from "@/hooks/useEthersSigner"
+
+const ZetaChainContext = createContext<any>(undefined!)
+
+interface ZetaChainProviderProps {
+  children: ReactNode
+}
+
+export function ZetaChainProvider({ children }: ZetaChainProviderProps) {
+  const signer = useEthersSigner()
+
+  const createClient = useCallback((signer: any) => {
+    return new ZetaChainClient({
+      signer: signer,
+      network: "testnet",
+      chains: {
+        zeta_testnet: {
+          api: [
+            {
+              url: `https://zetachain-athens.g.allthatnode.com/archive/evm/${process.env.NEXT_PUBLIC_ATN_KEY}`,
+              type: "evm",
+            },
+          ],
+        },
+      },
+    })
+  }, [])
+
+  const [client, setClient] = useState(() => createClient(signer))
+
+  useEffect(() => {
+    if (signer) {
+      setClient(createClient(signer))
+    }
+  }, [signer, createClient])
+
+  return (
+    <ZetaChainContext.Provider value={{ client }}>
+      {children}
+    </ZetaChainContext.Provider>
+  )
+}
+
+export function useZetaChainClient(): any {
+  const context = useContext(ZetaChainContext)
+  if (context === undefined) {
+    throw new Error("useZetaChain must be used within a ZetaChainProvider")
+  }
+  return context
+}
diff --git a/lib/fonts.ts b/lib/fonts.ts
deleted file mode 100644
index eb51e11..0000000
--- a/lib/fonts.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { JetBrains_Mono as FontMono, Inter as FontSans } from "next/font/google"
-
-export const fontSans = FontSans({
-  subsets: ["latin"],
-  variable: "--font-sans",
-})
-
-export const fontMono = FontMono({
-  subsets: ["latin"],
-  variable: "--font-mono",
-})
diff --git a/package.json b/package.json
index e4cb5cb..9bb68e3 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "@uniswap/v3-core": "^1.0.1",
     "@uniswap/v3-sdk": "^3.10.0",
     "@zetachain/example-contracts": "1.0.0-rc1",
-    "@zetachain/toolkit": "6.0.0",
+    "@zetachain/toolkit": "11.0.0-rc1",
     "bech32": "^2.0.0",
     "class-variance-authority": "^0.4.0",
     "clsx": "^1.2.1",
diff --git a/types/nav.ts b/types/nav.ts
deleted file mode 100644
index 0961ce8..0000000
--- a/types/nav.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export interface NavItem {
-  title: string
-  href?: string
-  disabled?: boolean
-  external?: boolean
-}
diff --git a/yarn.lock b/yarn.lock
index d4388f9..aa86963 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1863,10 +1863,10 @@
   resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-3.4.2-solc-0.7.tgz#38f4dbab672631034076ccdf2f3201fab1726635"
   integrity sha512-W6QmqgkADuFcTLzHL8vVoNBtkwjvQRpYIAom7KiUNoLKghyx3FgH0GBjt8NRvigV1ZmMOBllvE1By1C+bi8WpA==
 
-"@openzeppelin/contracts@^4.9.2":
-  version "4.9.3"
-  resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-4.9.3.tgz#00d7a8cf35a475b160b3f0293a6403c511099364"
-  integrity sha512-He3LieZ1pP2TNt5JbkPA4PNT9WC3gOTOlDcFGJW4Le4QKqwmiNJCRt44APfxMxvq7OugU/cqYuPcSBzOw38DAg==
+"@openzeppelin/contracts@^4.9.6":
+  version "4.9.6"
+  resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-4.9.6.tgz#2a880a24eb19b4f8b25adc2a5095f2aa27f39677"
+  integrity sha512-xSmezSupL+y9VkHZJGDoCBpmnB2ogM13ccaYDWqJTfS3dbuHkgjuwDFUmaFauBCboQMGB/S5UqUl2y54X99BmA==
 
 "@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2":
   version "1.1.2"
@@ -3664,31 +3664,31 @@
     typescript "5.0.4"
     zod "3.19.1"
 
-"@zetachain/networks@6.0.0":
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/@zetachain/networks/-/networks-6.0.0.tgz#ae5d3cd1678b32510edfaa71f8f4a6f4cbc1d9ab"
-  integrity sha512-yKFVP/yJDp76Q5lBGfZSpY/KO3TZ9ldo0lhE4MpBW43EsBxOZWixg6sqb56mcU/gg1lbWG8sHHWtYFK51SByjQ==
+"@zetachain/networks@7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@zetachain/networks/-/networks-7.0.0.tgz#a5f8a188d633e2064ee7c77499351381ba891441"
+  integrity sha512-/amSq+KNJe+EGj0ioZS+DZJtsnbPSDotp9LsrAbaEVMAxKvBK/XkvggH73sJyRWWeMpfhHrNPlrKTLrN+mRkIg==
   dependencies:
     dotenv "^16.1.4"
 
-"@zetachain/protocol-contracts@7.0.0-rc1":
-  version "7.0.0-rc1"
-  resolved "https://registry.yarnpkg.com/@zetachain/protocol-contracts/-/protocol-contracts-7.0.0-rc1.tgz#588483d1ec70e572b7e40e84ef5b34282b0ab375"
-  integrity sha512-vgS+Pjh4MysOyw8WbqTQVBsHJYqKvMcdV7cNVqxaTJd/dl2ak7NNvsIeaeUnxQrp8XfQol2B8GXJpVLM6MK/dg==
+"@zetachain/protocol-contracts@7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@zetachain/protocol-contracts/-/protocol-contracts-7.0.0.tgz#20eb6c62d805d7470408ccdff0e3614684bca174"
+  integrity sha512-8JTNFZxVZYmDtAXJIEr+tkakuML12X42Fya4bJ1NkfWiVMkcSej92BSTl/35qYtHdjY7vXy9uMrfXEqfw5rsPw==
 
-"@zetachain/toolkit@6.0.0":
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/@zetachain/toolkit/-/toolkit-6.0.0.tgz#385cfd11f1ac39cbb6ca6410109523e2ab6f8841"
-  integrity sha512-JAtl7CX8cMJ+iw/byjcbLqgCfPS87vkdYCZOPBBOudqUySPTz4owqVgGZB/xYRyXBsF0KW0F6R65sc+fleQ86A==
+"@zetachain/toolkit@11.0.0-rc1":
+  version "11.0.0-rc1"
+  resolved "https://registry.yarnpkg.com/@zetachain/toolkit/-/toolkit-11.0.0-rc1.tgz#06f1e0daf8d4ed79ca080bf07c1e1b48d987b04b"
+  integrity sha512-RW7PnabX4R3Qsx7i8M+CcyybgNXC94TfokjHZhLc1bzk/vZOPnQdHiOZvUs6wMLZ/simzTl1WDCnAdxTaKuLlw==
   dependencies:
     "@inquirer/prompts" "^2.1.1"
     "@inquirer/select" "1.1.3"
     "@nomiclabs/hardhat-ethers" "^2.2.3"
-    "@openzeppelin/contracts" "^4.9.2"
+    "@openzeppelin/contracts" "^4.9.6"
     "@uniswap/v2-periphery" "^1.1.0-beta.0"
     "@zetachain/faucet-cli" "^4.0.1"
-    "@zetachain/networks" "6.0.0"
-    "@zetachain/protocol-contracts" "7.0.0-rc1"
+    "@zetachain/networks" "7.0.0"
+    "@zetachain/protocol-contracts" "7.0.0"
     axios "^1.4.0"
     bech32 "^2.0.0"
     bip39 "^3.1.0"