diff --git a/.gitignore b/.gitignore
index 83bea81b7..6cbb19ee7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,7 @@
 .env.development.local
 .env.test.local
 .env.production.local
+.env*.local
 
 # IDE
 .idea
diff --git a/api/_constants.ts b/api/_constants.ts
index bd1a12522..c2969c1c8 100644
--- a/api/_constants.ts
+++ b/api/_constants.ts
@@ -1,10 +1,15 @@
 import { ethers } from "ethers";
-import { constants, relayFeeCalculator, utils } from "@across-protocol/sdk-v2";
+import { relayFeeCalculator, utils } from "@across-protocol/sdk-v2";
+import * as constants from "@across-protocol/constants-v2";
+
+export const TOKEN_SYMBOLS_MAP = constants.TOKEN_SYMBOLS_MAP;
+
+export const CHAIN_IDs = constants.CHAIN_IDs;
 
 export const maxRelayFeePct = 0.25;
 
 export const disabledL1Tokens = [
-  constants.TOKEN_SYMBOLS_MAP.BADGER.addresses[constants.CHAIN_IDs.MAINNET],
+  TOKEN_SYMBOLS_MAP.BADGER.addresses[CHAIN_IDs.MAINNET],
 ].map((x) => x.toLowerCase());
 
 const defaultRelayerFeeCapitalCostConfig: {
@@ -105,22 +110,18 @@ export const SUPPORTED_CG_BASE_CURRENCIES = new Set(["eth", "usd"]);
 // 1:1 because we don't need to handle underlying tokens on FE
 export const EXTERNAL_POOL_TOKEN_EXCHANGE_RATE = utils.fixedPointAdjustment;
 
-export const TOKEN_SYMBOLS_MAP = constants.TOKEN_SYMBOLS_MAP;
-
-export const CHAIN_IDS = constants.CHAIN_IDs;
-
 export const ENABLED_POOLS_UNDERLYING_TOKENS = [
-  constants.TOKEN_SYMBOLS_MAP.ETH,
-  constants.TOKEN_SYMBOLS_MAP.WETH,
-  constants.TOKEN_SYMBOLS_MAP.USDC,
-  constants.TOKEN_SYMBOLS_MAP.USDT,
-  constants.TOKEN_SYMBOLS_MAP.DAI,
-  constants.TOKEN_SYMBOLS_MAP.WBTC,
-  constants.TOKEN_SYMBOLS_MAP.BAL,
-  constants.TOKEN_SYMBOLS_MAP.UMA,
-  constants.TOKEN_SYMBOLS_MAP.ACX,
-  constants.TOKEN_SYMBOLS_MAP.SNX,
-  constants.TOKEN_SYMBOLS_MAP.POOL,
+  TOKEN_SYMBOLS_MAP.ETH,
+  TOKEN_SYMBOLS_MAP.WETH,
+  TOKEN_SYMBOLS_MAP.USDC,
+  TOKEN_SYMBOLS_MAP.USDT,
+  TOKEN_SYMBOLS_MAP.DAI,
+  TOKEN_SYMBOLS_MAP.WBTC,
+  TOKEN_SYMBOLS_MAP.BAL,
+  TOKEN_SYMBOLS_MAP.UMA,
+  TOKEN_SYMBOLS_MAP.ACX,
+  TOKEN_SYMBOLS_MAP.SNX,
+  TOKEN_SYMBOLS_MAP.POOL,
 ];
 
 export const SECONDS_PER_YEAR = 365 * 24 * 60 * 60;
diff --git a/api/_utils.ts b/api/_utils.ts
index 514d68853..9dd9a51a2 100644
--- a/api/_utils.ts
+++ b/api/_utils.ts
@@ -24,7 +24,7 @@ import {
 import { StaticJsonRpcProvider } from "@ethersproject/providers";
 import { VercelResponse } from "@vercel/node";
 import {
-  CHAIN_IDS,
+  CHAIN_IDs,
   MULTICALL3_ADDRESS,
   DEFI_LLAMA_POOL_LOOKUP,
   EXTERNAL_POOL_TOKEN_EXCHANGE_RATE,
@@ -41,14 +41,14 @@ const {
   REACT_APP_HUBPOOL_CHAINID,
   REACT_APP_PUBLIC_INFURA_ID,
   REACT_APP_COINGECKO_PRO_API_KEY,
-  REACT_APP_GOOGLE_SERVICE_ACCOUNT,
+  GOOGLE_SERVICE_ACCOUNT: _GOOGLE_SERVICE_ACCOUNT,
   VERCEL_ENV,
   GAS_MARKUP,
   DISABLE_DEBUG_LOGS,
 } = process.env;
 
-const GOOGLE_SERVICE_ACCOUNT = REACT_APP_GOOGLE_SERVICE_ACCOUNT
-  ? JSON.parse(REACT_APP_GOOGLE_SERVICE_ACCOUNT)
+const GOOGLE_SERVICE_ACCOUNT = _GOOGLE_SERVICE_ACCOUNT
+  ? JSON.parse(_GOOGLE_SERVICE_ACCOUNT)
   : {};
 
 export const gasMarkup = GAS_MARKUP ? JSON.parse(GAS_MARKUP) : {};
@@ -279,8 +279,7 @@ export const makeHubPoolClientConfig = (chainId = 1) => {
     1: {
       chainId: 1,
       hubPoolAddress: "0xc186fA914353c44b2E33eBE05f21846F1048bEda",
-      wethAddress:
-        TOKEN_SYMBOLS_MAP.WETH.addresses[sdk.constants.CHAIN_IDs.MAINNET],
+      wethAddress: TOKEN_SYMBOLS_MAP.WETH.addresses[CHAIN_IDs.MAINNET],
       configStoreAddress: "0x3B03509645713718B78951126E0A6de6f10043f5",
       acceleratingDistributorAddress:
         "0x9040e41eF5E8b281535a96D9a48aCb8cfaBD9a48",
@@ -289,8 +288,7 @@ export const makeHubPoolClientConfig = (chainId = 1) => {
     5: {
       chainId: 5,
       hubPoolAddress: "0x0e2817C49698cc0874204AeDf7c72Be2Bb7fCD5d",
-      wethAddress:
-        TOKEN_SYMBOLS_MAP.WETH.addresses[sdk.constants.CHAIN_IDs.GOERLI],
+      wethAddress: TOKEN_SYMBOLS_MAP.WETH.addresses[CHAIN_IDs.GOERLI],
       configStoreAddress: "0x3215e3C91f87081757d0c41EF0CB77738123Be83",
       acceleratingDistributorAddress:
         "0xA59CE9FDFf8a0915926C2AF021d54E58f9B207CC",
@@ -329,116 +327,116 @@ export const queries: Record<
   number,
   () => sdk.relayFeeCalculator.QueryInterface
 > = {
-  [CHAIN_IDS.MAINNET]: () =>
+  [CHAIN_IDs.MAINNET]: () =>
     new sdk.relayFeeCalculator.EthereumQueries(
-      getProvider(CHAIN_IDS.MAINNET),
+      getProvider(CHAIN_IDs.MAINNET),
       undefined,
       undefined,
       undefined,
       undefined,
       REACT_APP_COINGECKO_PRO_API_KEY,
       getLogger(),
-      getGasMarkup(CHAIN_IDS.MAINNET)
+      getGasMarkup(CHAIN_IDs.MAINNET)
     ),
-  [CHAIN_IDS.OPTIMISM]: () =>
+  [CHAIN_IDs.OPTIMISM]: () =>
     new sdk.relayFeeCalculator.OptimismQueries(
-      getProvider(CHAIN_IDS.OPTIMISM),
+      getProvider(CHAIN_IDs.OPTIMISM),
       undefined,
       undefined,
       undefined,
       undefined,
       REACT_APP_COINGECKO_PRO_API_KEY,
       getLogger(),
-      getGasMarkup(CHAIN_IDS.OPTIMISM)
+      getGasMarkup(CHAIN_IDs.OPTIMISM)
     ),
-  [CHAIN_IDS.POLYGON]: () =>
+  [CHAIN_IDs.POLYGON]: () =>
     new sdk.relayFeeCalculator.PolygonQueries(
-      getProvider(CHAIN_IDS.POLYGON),
+      getProvider(CHAIN_IDs.POLYGON),
       undefined,
       undefined,
       undefined,
       undefined,
       REACT_APP_COINGECKO_PRO_API_KEY,
       getLogger(),
-      getGasMarkup(CHAIN_IDS.POLYGON)
+      getGasMarkup(CHAIN_IDs.POLYGON)
     ),
-  [CHAIN_IDS.ARBITRUM]: () =>
+  [CHAIN_IDs.ARBITRUM]: () =>
     new sdk.relayFeeCalculator.ArbitrumQueries(
-      getProvider(CHAIN_IDS.ARBITRUM),
+      getProvider(CHAIN_IDs.ARBITRUM),
       undefined,
       undefined,
       undefined,
       undefined,
       REACT_APP_COINGECKO_PRO_API_KEY,
       getLogger(),
-      getGasMarkup(CHAIN_IDS.ARBITRUM)
+      getGasMarkup(CHAIN_IDs.ARBITRUM)
     ),
-  [CHAIN_IDS.ZK_SYNC]: () =>
+  [CHAIN_IDs.ZK_SYNC]: () =>
     new sdk.relayFeeCalculator.ZkSyncQueries(
-      getProvider(CHAIN_IDS.ZK_SYNC),
+      getProvider(CHAIN_IDs.ZK_SYNC),
       undefined,
       undefined,
       undefined,
       undefined,
       REACT_APP_COINGECKO_PRO_API_KEY,
       getLogger(),
-      getGasMarkup(CHAIN_IDS.ZK_SYNC)
+      getGasMarkup(CHAIN_IDs.ZK_SYNC)
     ),
-  [CHAIN_IDS.BASE]: () =>
+  [CHAIN_IDs.BASE]: () =>
     new sdk.relayFeeCalculator.BaseQueries(
-      getProvider(CHAIN_IDS.BASE),
+      getProvider(CHAIN_IDs.BASE),
       undefined,
       undefined,
       undefined,
       undefined,
       REACT_APP_COINGECKO_PRO_API_KEY,
       getLogger(),
-      getGasMarkup(CHAIN_IDS.BASE)
+      getGasMarkup(CHAIN_IDs.BASE)
     ),
   /* --------------------------- Testnet queries --------------------------- */
-  [CHAIN_IDS.GOERLI]: () =>
+  [CHAIN_IDs.GOERLI]: () =>
     new sdk.relayFeeCalculator.EthereumGoerliQueries(
-      getProvider(CHAIN_IDS.GOERLI),
+      getProvider(CHAIN_IDs.GOERLI),
       undefined,
       undefined,
       undefined,
       undefined,
       REACT_APP_COINGECKO_PRO_API_KEY,
       getLogger(),
-      getGasMarkup(CHAIN_IDS.GOERLI)
+      getGasMarkup(CHAIN_IDs.GOERLI)
     ),
-  [CHAIN_IDS.ARBITRUM_GOERLI]: () =>
+  [CHAIN_IDs.ARBITRUM_GOERLI]: () =>
     new sdk.relayFeeCalculator.ArbitrumGoerliQueries(
-      getProvider(CHAIN_IDS.ARBITRUM_GOERLI),
+      getProvider(CHAIN_IDs.ARBITRUM_GOERLI),
       undefined,
       undefined,
       undefined,
       undefined,
       REACT_APP_COINGECKO_PRO_API_KEY,
       getLogger(),
-      getGasMarkup(CHAIN_IDS.ARBITRUM_GOERLI)
+      getGasMarkup(CHAIN_IDs.ARBITRUM_GOERLI)
     ),
-  [CHAIN_IDS.ZK_SYNC_GOERLI]: () =>
+  [CHAIN_IDs.ZK_SYNC_GOERLI]: () =>
     new sdk.relayFeeCalculator.zkSyncGoerliQueries(
-      getProvider(CHAIN_IDS.ZK_SYNC_GOERLI),
+      getProvider(CHAIN_IDs.ZK_SYNC_GOERLI),
       undefined,
       undefined,
       undefined,
       undefined,
       REACT_APP_COINGECKO_PRO_API_KEY,
       getLogger(),
-      getGasMarkup(CHAIN_IDS.ZK_SYNC_GOERLI)
+      getGasMarkup(CHAIN_IDs.ZK_SYNC_GOERLI)
     ),
-  [CHAIN_IDS.BASE_GOERLI]: () =>
+  [CHAIN_IDs.BASE_GOERLI]: () =>
     new sdk.relayFeeCalculator.BaseGoerliQueries(
-      getProvider(CHAIN_IDS.BASE_GOERLI),
+      getProvider(CHAIN_IDs.BASE_GOERLI),
       undefined,
       undefined,
       undefined,
       undefined,
       REACT_APP_COINGECKO_PRO_API_KEY,
       getLogger(),
-      getGasMarkup(CHAIN_IDS.BASE_GOERLI)
+      getGasMarkup(CHAIN_IDs.BASE_GOERLI)
     ),
 };
 
@@ -564,7 +562,7 @@ export const getSpokePool = (_chainId: number): SpokePool => {
 
 export const getSpokePoolAddress = (chainId: number): string => {
   switch (chainId) {
-    case CHAIN_IDS.ARBITRUM_GOERLI:
+    case CHAIN_IDs.ARBITRUM_GOERLI:
       return "0xD29C85F15DF544bA632C9E25829fd29d767d7978";
     default:
       return sdk.utils.getDeployedAddress("SpokePool", chainId);
diff --git a/api/coingecko.ts b/api/coingecko.ts
index ac8ffc986..598a75842 100644
--- a/api/coingecko.ts
+++ b/api/coingecko.ts
@@ -9,9 +9,13 @@ import {
   validAddress,
   getBalancerV2TokenPrice,
 } from "./_utils";
-import { SUPPORTED_CG_BASE_CURRENCIES } from "./_constants";
+import {
+  SUPPORTED_CG_BASE_CURRENCIES,
+  CHAIN_IDs,
+  TOKEN_SYMBOLS_MAP,
+} from "./_constants";
 
-import { coingecko, constants as sdkConstants } from "@across-protocol/sdk-v2";
+import { coingecko } from "@across-protocol/sdk-v2";
 
 const { Coingecko } = coingecko;
 const {
@@ -33,7 +37,7 @@ const getCoingeckoPrices = async (
   } = {},
   balancerV2PoolTokens: string[] = []
 ): Promise<number> => {
-  const baseCurrencyToken = Object.values(sdkConstants.TOKEN_SYMBOLS_MAP).find(
+  const baseCurrencyToken = Object.values(TOKEN_SYMBOLS_MAP).find(
     ({ symbol }) => symbol === baseCurrency.toUpperCase()
   );
 
@@ -42,7 +46,7 @@ const getCoingeckoPrices = async (
   // Special case: token and base are the same. Coingecko class returns a single result in this case, so it must
   // be handled separately.
   const baseCurrentTokenAddress =
-    baseCurrencyToken.addresses[sdkConstants.CHAIN_IDs.MAINNET];
+    baseCurrencyToken.addresses[CHAIN_IDs.MAINNET];
   if (tokenAddress.toLowerCase() === baseCurrentTokenAddress.toLowerCase())
     return 1;
 
diff --git a/api/token-list.ts b/api/token-list.ts
index d5c870ee8..d1962c179 100644
--- a/api/token-list.ts
+++ b/api/token-list.ts
@@ -1,5 +1,4 @@
 import { VercelResponse } from "@vercel/node";
-import { constants } from "@across-protocol/sdk-v2";
 import {
   getLogger,
   handleErrorCondition,
@@ -8,6 +7,7 @@ import {
   DISABLED_CHAINS_FOR_AVAILABLE_ROUTES,
 } from "./_utils";
 import { TypedVercelRequest } from "./_types";
+import { TOKEN_SYMBOLS_MAP } from "./_constants";
 
 const handler = async (_: TypedVercelRequest<{}>, response: VercelResponse) => {
   const logger = getLogger();
@@ -48,10 +48,10 @@ const handler = async (_: TypedVercelRequest<{}>, response: VercelResponse) => {
     const enrichedTokensPerChain = Object.values(tokensPerChain).map(
       (token) => {
         const tokenInfo =
-          constants.TOKEN_SYMBOLS_MAP[
+          TOKEN_SYMBOLS_MAP[
             ["USDC.e", "USDbC"].includes(token.symbol)
               ? "USDC"
-              : (token.symbol as keyof typeof constants.TOKEN_SYMBOLS_MAP)
+              : (token.symbol as keyof typeof TOKEN_SYMBOLS_MAP)
           ];
         return {
           ...token,
diff --git a/package.json b/package.json
index fa80d8a76..dae84d867 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,8 @@
   "private": true,
   "license": "AGPL-3.0-only",
   "dependencies": {
-    "@across-protocol/sdk-v2": "^0.16.2",
+    "@across-protocol/constants-v2": "^1.0.4",
+    "@across-protocol/sdk-v2": "^0.16.4",
     "@amplitude/analytics-browser": "^1.6.6",
     "@amplitude/marketing-analytics-browser": "^0.3.6",
     "@balancer-labs/sdk": "^1.1.3",
@@ -15,14 +16,16 @@
     "@fortawesome/react-fontawesome": "^0.2.0",
     "@google-cloud/logging": "^10.1.1",
     "@reach/dialog": "^0.16.2",
+    "@safe-global/safe-apps-provider": "^0.18.0",
+    "@safe-global/safe-apps-sdk": "^8.1.0",
     "@sentry/react": "^7.37.2",
     "@uma/sdk": "^0.22.2",
-    "@web3-onboard/coinbase": "^2.2.4",
-    "@web3-onboard/core": "^2.20.4",
-    "@web3-onboard/gnosis": "^2.1.10",
-    "@web3-onboard/injected-wallets": "^2.10.2",
-    "@web3-onboard/react": "^2.8.9",
-    "@web3-onboard/walletconnect": "^2.4.1",
+    "@web3-onboard/coinbase": "^2.2.5",
+    "@web3-onboard/core": "^2.21.2",
+    "@web3-onboard/gnosis": "^2.2.0",
+    "@web3-onboard/injected-wallets": "^2.10.6",
+    "@web3-onboard/react": "^2.8.13",
+    "@web3-onboard/walletconnect": "^2.4.6",
     "axios": "^0.27.2",
     "bnc-notify": "^1.9.8",
     "copy-to-clipboard": "^3.3.3",
@@ -49,7 +52,7 @@
   },
   "scripts": {
     "start": "export REACT_APP_GIT_COMMIT_HASH=$(git rev-parse HEAD) && vite",
-    "dev": "export REACT_APP_GIT_COMMIT_HASH=$(git rev-parse HEAD) && vite --port $PORT",
+    "dev": "export REACT_APP_GIT_COMMIT_HASH=$(git rev-parse HEAD) && vite --port $PORT --host",
     "build": "export REACT_APP_GIT_COMMIT_HASH=$(git rev-parse HEAD) && tsc && vite build",
     "analyze": "yarn build --stats && webpack-bundle-analyzer build/bundle-stats.json -m server -r build/bundle-stats.html",
     "test": "export REACT_APP_GIT_COMMIT_HASH=$(git rev-parse HEAD) && jest --env jsdom src",
diff --git a/patches/@web3-onboard+walletconnect+2.4.1.patch b/patches/@web3-onboard+walletconnect+2.4.1.patch
deleted file mode 100644
index efb5267e3..000000000
--- a/patches/@web3-onboard+walletconnect+2.4.1.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/node_modules/@web3-onboard/walletconnect/dist/v2.js b/node_modules/@web3-onboard/walletconnect/dist/v2.js
-index e24edd8..459a4ab 100644
---- a/node_modules/@web3-onboard/walletconnect/dist/v2.js
-+++ b/node_modules/@web3-onboard/walletconnect/dist/v2.js
-@@ -48,7 +48,7 @@ function walletConnect(options) {
-                     ? // @ts-ignore
-                         // Required as WC package does not support hex numbers
-                         requiredChains.map(chainID => parseInt(chainID))
--                    : [1];
-+                    : [];
-                 // Defaults to the chains provided within the web3-onboard init chain property
-                 const optionalChainsParsed = Array.isArray(optionalChains) &&
-                     optionalChains.length &&
diff --git a/src/components/Layout/Layout.tsx b/src/components/Layout/Layout.tsx
deleted file mode 100644
index 3e92a81af..000000000
--- a/src/components/Layout/Layout.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import React from "react";
-import styled from "@emotion/styled";
-
-import { COLORS } from "utils";
-
-import Footer from "../Footer/Footer";
-
-const Layout: React.FC = ({ children }) => (
-  <>
-    <Wrapper>
-      <Main>{children}</Main>
-    </Wrapper>
-    <FooterWrapper>
-      <Footer />
-    </FooterWrapper>
-  </>
-);
-
-export default Layout;
-
-const FooterWrapper = styled.div`
-  margin-top: -74px;
-`;
-
-const Wrapper = styled.div`
-  display: grid;
-  padding: 0 10px;
-  grid-template-columns: 1fr min(var(--central-content), 100%) 1fr;
-  min-height: 100vh;
-`;
-
-const Main = styled.main`
-  height: 100%;
-  grid-column: 2;
-  box-shadow: 0 0 120px hsla(${COLORS.primary[500]} / 0.25);
-  clip-path: inset(0px -160px 0px -160px);
-`;
diff --git a/src/components/Layout/index.ts b/src/components/Layout/index.ts
deleted file mode 100644
index b68828ddc..000000000
--- a/src/components/Layout/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import Layout from "./Layout";
-export default Layout;
diff --git a/src/components/Pagination/Pagination.styles.tsx b/src/components/Pagination/Pagination.styles.tsx
index e500d0a8e..26281acb5 100644
--- a/src/components/Pagination/Pagination.styles.tsx
+++ b/src/components/Pagination/Pagination.styles.tsx
@@ -1,7 +1,7 @@
 import { keyframes } from "@emotion/react";
 import styled from "@emotion/styled";
 import { BaseButton } from "components/Buttons";
-import { QUERIES } from "utils";
+import { QUERIESV2 } from "utils";
 import { ReactComponent as ArrowIcon } from "assets/icons/arrow-16.svg";
 
 export const Wrapper = styled.div`
@@ -10,16 +10,16 @@ export const Wrapper = styled.div`
   width: 100%;
   padding: ${16 / 16}rem ${16 / 16}rem 0;
 
-  @media ${QUERIES.mobileAndDown} {
+  @media ${QUERIESV2.sm.andDown} {
     flex-direction: column;
-    align-items: flex-end;
+    align-items: center;
   }
 `;
 
 export const PageSizeSelectWrapper = styled.div`
   position: relative;
 
-  @media ${QUERIES.mobileAndDown} {
+  @media ${QUERIESV2.sm.andDown} {
     margin-bottom: 1rem;
   }
 `;
@@ -90,7 +90,24 @@ export const PaginationElements = styled.div`
   align-items: center;
   justify-content: right;
   gap: 6px;
-  font-weight: 500;
+
+  @media ${QUERIESV2.sm.andDown} {
+    align-items: center;
+    justify-content: center;
+    flex-direction: column;
+  }
+`;
+
+export const PageNumbersWrapper = styled.div`
+  display: flex;
+  flex-direction: row;
+  gap: 6px;
+`;
+
+export const PrevNextWrapper = styled.div`
+  display: flex;
+  flex-direction: row;
+  gap: 6px;
 `;
 
 interface IElementWrapper {
@@ -98,12 +115,12 @@ interface IElementWrapper {
 }
 
 export const ElementWrapper = styled.div<IElementWrapper>`
-  min-width: 40px;
-  padding: 8px 14px;
-  font-size: ${16 / 16}rem;
-  line-height: ${20 / 16}rem;
-  font-weight: 500;
-  color: #e0f3ff;
+  min-width: 36px;
+  min-height: 36px;
+  padding: 0px 8px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
   text-align: center;
   border: ${({ active }) =>
     active ? "1px solid #ffffff" : "1px solid var(--color-pagination)"};
@@ -114,6 +131,11 @@ export const ElementWrapper = styled.div<IElementWrapper>`
   :hover {
     opacity: 0.8;
   }
+
+  @media ${QUERIESV2.sm.andDown} {
+    min-width: 28px;
+    min-height: 28px;
+  }
 `;
 
 interface INextWrapper {
diff --git a/src/components/Pagination/PaginationExample.tsx b/src/components/Pagination/PaginationExample.tsx
index 9f40456a4..d67ae639d 100644
--- a/src/components/Pagination/PaginationExample.tsx
+++ b/src/components/Pagination/PaginationExample.tsx
@@ -8,10 +8,13 @@ import {
   PageSizeSelectDropdown,
   PageSizeOptiontButton,
   PagesPlaceholder,
+  PrevNextWrapper,
+  PageNumbersWrapper,
   ArrowIcon,
 } from "./Pagination.styles";
 import { useRef, useState } from "react";
 import useClickOutsideModal from "hooks/useClickOutsideModal";
+import { Text } from "components/Text";
 
 interface PageSizeProps {
   onPageSizeChange: (pageSize: number) => void;
@@ -39,7 +42,7 @@ export const PageSizeSelect: React.FC<PageSizeProps> = (props) => {
   return (
     <PageSizeSelectWrapper ref={ref}>
       <PageSizeSelectButton onClick={onSelectClick}>
-        {`${props.pageSize} results`}
+        <Text>{`${props.pageSize} results`}</Text>
         <ArrowIcon />
       </PageSizeSelectButton>
       {showDropdown && (
@@ -97,46 +100,51 @@ export const Pagination = ({
       />
       {pageSelectorEnabled && (
         <PaginationElements>
-          {!hideStart && (
+          <PageNumbersWrapper>
             <>
-              <ElementWrapper onClick={() => onPageChange(0)}>
-                {" "}
-                1{" "}
-              </ElementWrapper>
-              &nbsp; ... &nbsp;
+              {!hideStart && (
+                <>
+                  <ElementWrapper onClick={() => onPageChange(0)}>
+                    <Text>1</Text>
+                  </ElementWrapper>
+                  &nbsp; ... &nbsp;
+                </>
+              )}
+              {pageList.map((page, index) => {
+                return (
+                  <ElementWrapper
+                    active={index === activeIndex}
+                    key={page}
+                    onClick={() => onPageChange(page)}
+                  >
+                    <Text>{page + 1}</Text>
+                  </ElementWrapper>
+                );
+              })}
+              {!hideEnd && (
+                <>
+                  <PagesPlaceholder>...</PagesPlaceholder>
+                  <ElementWrapper onClick={() => onPageChange(lastPage)}>
+                    <Text>{lastPage + 1}</Text>
+                  </ElementWrapper>
+                </>
+              )}
             </>
-          )}
-          {pageList.map((page, index) => {
-            return (
-              <ElementWrapper
-                active={index === activeIndex}
-                key={page}
-                onClick={() => onPageChange(page)}
-              >
-                {page + 1}
-              </ElementWrapper>
-            );
-          })}
-          {!hideEnd && (
-            <>
-              <PagesPlaceholder>...</PagesPlaceholder>
-              <ElementWrapper onClick={() => onPageChange(lastPage)}>
-                {lastPage + 1}
-              </ElementWrapper>
-            </>
-          )}
-          <NextElement
-            disabled={disableBack}
-            onClick={() => onPageChange(currentPage - 1)}
-          >
-            <ArrowIcon />
-          </NextElement>
-          <NextElement
-            disabled={disableForward}
-            onClick={() => onPageChange(currentPage + 1)}
-          >
-            <ArrowIcon />
-          </NextElement>
+          </PageNumbersWrapper>
+          <PrevNextWrapper>
+            <NextElement
+              disabled={disableBack}
+              onClick={() => onPageChange(currentPage - 1)}
+            >
+              <ArrowIcon />
+            </NextElement>
+            <NextElement
+              disabled={disableForward}
+              onClick={() => onPageChange(currentPage + 1)}
+            >
+              <ArrowIcon />
+            </NextElement>
+          </PrevNextWrapper>
         </PaginationElements>
       )}
     </Wrapper>
diff --git a/src/components/RewardTable/RewardTables.styles.tsx b/src/components/RewardTable/RewardTables.styles.tsx
index d9093fa5e..65e54a61e 100644
--- a/src/components/RewardTable/RewardTables.styles.tsx
+++ b/src/components/RewardTable/RewardTables.styles.tsx
@@ -1,7 +1,7 @@
 import styled from "@emotion/styled";
 import { SecondaryButtonWithoutShadow } from "components/Buttons";
 import { ReactComponent as AcrossPlusIcon } from "assets/across-plus-icon.svg";
-import { QUERIES } from "utils";
+import { QUERIESV2 } from "utils";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { faCircleInfo } from "@fortawesome/free-solid-svg-icons";
 import { ReactComponent as ETHLogo } from "assets/eth.svg";
@@ -157,7 +157,7 @@ export const PaginationWrapper = styled.div`
   max-width: 1425px;
   margin: auto;
 
-  @media ${QUERIES.mobileAndDown} {
+  @media ${QUERIESV2.tb.andDown} {
     padding: 0 ${20 / 16}rem;
   }
 `;
diff --git a/src/components/Table/Table.styles.tsx b/src/components/Table/Table.styles.tsx
index 91f288933..09ed17bab 100644
--- a/src/components/Table/Table.styles.tsx
+++ b/src/components/Table/Table.styles.tsx
@@ -1,5 +1,7 @@
 import styled from "@emotion/styled";
 
+import { QUERIESV2 } from "utils";
+
 export const BaseWrapper = styled.div`
   margin: auto;
 `;
@@ -11,7 +13,7 @@ export const BaseTitle = styled.h2`
   line-height: ${26 / 16}rem;
   font-weight: 400;
 
-  @media (max-width: 428px) {
+  @media ${QUERIESV2.tb.andDown} {
     font-size: ${16 / 16}rem;
     line-height: ${20 / 16}rem;
   }
@@ -21,6 +23,7 @@ export const BaseTableWrapper = styled.div<{ scrollable?: boolean }>`
   border: 1px solid #3e4047;
   border-radius: 8px;
   overflow-x: ${({ scrollable }) => (scrollable ? "auto" : "hidden")};
+  overscroll-behavior-x: none;
 
   ::-webkit-scrollbar {
     height: 0;
@@ -61,7 +64,7 @@ export const BaseTableCell = styled.div`
   white-space: nowrap;
   background-color: #2d2e33;
 
-  @media (max-width: 428px) {
+  @media ${QUERIESV2.tb.andDown} {
     padding: ${13 / 16}rem 0 ${13 / 16}rem ${12 / 16}rem;
     font-size: ${14 / 16}rem;
     line-height: ${18 / 16}rem;
@@ -74,7 +77,7 @@ export const BaseHeadCell = styled(BaseTableCell)`
   background-color: #34353b;
   border: none;
 
-  @media (max-width: 428px) {
+  @media ${QUERIESV2.tb.andDown} {
     padding: ${7 / 16}rem 0 ${7 / 16}rem ${12 / 16}rem;
   }
 `;
@@ -88,7 +91,7 @@ export const BaseEmptyRow = styled.div`
   line-height: ${20 / 16}rem;
   color: #c5d5e0;
 
-  @media (max-width: 428px) {
+  @media ${QUERIESV2.tb.andDown} {
     padding: ${22 / 16}rem ${16 / 16}rem;
     font-size: ${14 / 16}rem;
     line-height: ${18 / 16}rem;
diff --git a/src/components/index.ts b/src/components/index.ts
index c7a9b25a5..25201c7af 100644
--- a/src/components/index.ts
+++ b/src/components/index.ts
@@ -1,5 +1,4 @@
 export { default as GlobalStyles } from "./GlobalStyles";
-export { default as Layout } from "./Layout";
 export { default as Header } from "./Header";
 export { default as Dialog } from "./Dialog";
 export { default as SuperHeader } from "./SuperHeader";
diff --git a/src/data/routes_1_0xc186fA914353c44b2E33eBE05f21846F1048bEda.json b/src/data/routes_1_0xc186fA914353c44b2E33eBE05f21846F1048bEda.json
index c05540526..95e8dc542 100644
--- a/src/data/routes_1_0xc186fA914353c44b2E33eBE05f21846F1048bEda.json
+++ b/src/data/routes_1_0xc186fA914353c44b2E33eBE05f21846F1048bEda.json
@@ -359,6 +359,15 @@
       "isNative": false,
       "l1TokenAddress": "0x6B175474E89094C44Da98b954EedeAC495271d0F"
     },
+    {
+      "fromChain": 1,
+      "toChain": 8453,
+      "fromTokenAddress": "0xba100000625a3754423978a60c9317c58a424e3D",
+      "fromSpokeAddress": "0x5c7BCd6E7De5423a257D81B442095A1a6ced35C5",
+      "fromTokenSymbol": "BAL",
+      "isNative": false,
+      "l1TokenAddress": "0xba100000625a3754423978a60c9317c58a424e3D"
+    },
     {
       "fromChain": 10,
       "toChain": 1,
@@ -710,6 +719,15 @@
       "isNative": false,
       "l1TokenAddress": "0x6B175474E89094C44Da98b954EedeAC495271d0F"
     },
+    {
+      "fromChain": 10,
+      "toChain": 8453,
+      "fromTokenAddress": "0xFE8B128bA8C78aabC59d4c64cEE7fF28e9379921",
+      "fromSpokeAddress": "0x6f26Bf09B1C792e3228e5467807a900A503c0281",
+      "fromTokenSymbol": "BAL",
+      "isNative": false,
+      "l1TokenAddress": "0xba100000625a3754423978a60c9317c58a424e3D"
+    },
     {
       "fromChain": 137,
       "toChain": 1,
@@ -1007,6 +1025,15 @@
       "isNative": false,
       "l1TokenAddress": "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48"
     },
+    {
+      "fromChain": 137,
+      "toChain": 8453,
+      "fromTokenAddress": "0x9a71012B13CA4d3D0Cdc72A177DF3ef03b0E76A3",
+      "fromSpokeAddress": "0x9295ee1d8C5b022Be115A2AD3c30C72E34e7F096",
+      "fromTokenSymbol": "BAL",
+      "isNative": false,
+      "l1TokenAddress": "0xba100000625a3754423978a60c9317c58a424e3D"
+    },
     {
       "fromChain": 42161,
       "toChain": 1,
@@ -1331,6 +1358,15 @@
       "isNative": false,
       "l1TokenAddress": "0x6B175474E89094C44Da98b954EedeAC495271d0F"
     },
+    {
+      "fromChain": 42161,
+      "toChain": 8453,
+      "fromTokenAddress": "0x040d1EdC9569d4Bab2D15287Dc5A4F10F56a56B8",
+      "fromSpokeAddress": "0xe35e9842fceaCA96570B734083f4a58e8F7C5f2A",
+      "fromTokenSymbol": "BAL",
+      "isNative": false,
+      "l1TokenAddress": "0xba100000625a3754423978a60c9317c58a424e3D"
+    },
     {
       "fromChain": 324,
       "toChain": 1,
@@ -1701,6 +1737,42 @@
       "fromTokenSymbol": "ETH",
       "isNative": true,
       "l1TokenAddress": "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2"
+    },
+    {
+      "fromChain": 8453,
+      "toChain": 1,
+      "fromTokenAddress": "0x4158734D47Fc9692176B5085E0F52ee0Da5d47F1",
+      "fromSpokeAddress": "0x09aea4b2242abC8bb4BB78D537A67a245A7bEC64",
+      "fromTokenSymbol": "BAL",
+      "isNative": false,
+      "l1TokenAddress": "0xba100000625a3754423978a60c9317c58a424e3D"
+    },
+    {
+      "fromChain": 8453,
+      "toChain": 10,
+      "fromTokenAddress": "0x4158734D47Fc9692176B5085E0F52ee0Da5d47F1",
+      "fromSpokeAddress": "0x09aea4b2242abC8bb4BB78D537A67a245A7bEC64",
+      "fromTokenSymbol": "BAL",
+      "isNative": false,
+      "l1TokenAddress": "0xba100000625a3754423978a60c9317c58a424e3D"
+    },
+    {
+      "fromChain": 8453,
+      "toChain": 42161,
+      "fromTokenAddress": "0x4158734D47Fc9692176B5085E0F52ee0Da5d47F1",
+      "fromSpokeAddress": "0x09aea4b2242abC8bb4BB78D537A67a245A7bEC64",
+      "fromTokenSymbol": "BAL",
+      "isNative": false,
+      "l1TokenAddress": "0xba100000625a3754423978a60c9317c58a424e3D"
+    },
+    {
+      "fromChain": 8453,
+      "toChain": 137,
+      "fromTokenAddress": "0x4158734D47Fc9692176B5085E0F52ee0Da5d47F1",
+      "fromSpokeAddress": "0x09aea4b2242abC8bb4BB78D537A67a245A7bEC64",
+      "fromTokenSymbol": "BAL",
+      "isNative": false,
+      "l1TokenAddress": "0xba100000625a3754423978a60c9317c58a424e3D"
     }
   ],
   "pools": [
@@ -1708,5 +1780,9 @@
       "tokenSymbol": "BOBA",
       "isNative": false
     }
-  ]
+  ],
+  "spokePoolVerifier": {
+    "address": "0x269727F088F16E1Aea52Cf5a97B1CD41DAA3f02D",
+    "enabledChains": [1, 10, 137, 8453, 42161]
+  }
 }
diff --git a/src/data/routes_5_0x0e2817C49698cc0874204AeDf7c72Be2Bb7fCD5d.json b/src/data/routes_5_0x0e2817C49698cc0874204AeDf7c72Be2Bb7fCD5d.json
index 5d03b2bdb..07bf401ba 100644
--- a/src/data/routes_5_0x0e2817C49698cc0874204AeDf7c72Be2Bb7fCD5d.json
+++ b/src/data/routes_5_0x0e2817C49698cc0874204AeDf7c72Be2Bb7fCD5d.json
@@ -63,5 +63,9 @@
       "l1TokenAddress": "0x07865c6E87B9F70255377e024ace6630C1Eaa37F"
     }
   ],
-  "pools": []
+  "pools": [],
+  "spokePoolVerifier": {
+    "address": "0x269727F088F16E1Aea52Cf5a97B1CD41DAA3f02D",
+    "enabledChains": []
+  }
 }
diff --git a/src/hooks/useDeposits.ts b/src/hooks/useDeposits.ts
index 16e1df8b3..96e1190d1 100644
--- a/src/hooks/useDeposits.ts
+++ b/src/hooks/useDeposits.ts
@@ -88,7 +88,9 @@ export function useUserDeposits(
       // To provide a better UX, we take optimistically updated local pending deposits
       // into account to show on the "My Transactions" page.
       const localPendingUserDeposits = getLocalPendingDeposits().filter(
-        (deposit) => deposit.depositorAddr === userAddress
+        (deposit) =>
+          deposit.depositorAddr === userAddress ||
+          deposit.recipientAddr === userAddress
       );
       const { deposits, pagination } = await getDeposits({
         address: userAddress,
diff --git a/src/onboard-override.css b/src/onboard-override.css
index c82320c89..36c27d65c 100644
--- a/src/onboard-override.css
+++ b/src/onboard-override.css
@@ -1,15 +1,8 @@
-
 /* Override root variables to style the Onboard modal */
 :root {
-  --onboard-connect-header-background: #34353b;
-  --onboard-connect-header-color: #e0f3ff;
-  --onboard-connect-sidebar-color: #e0f3ff;
-  --onboard-connect-sidebar-background: #2d2e33;
-  --onboard-modal-background: #34353b;
-  --onboard-wallet-button-background: var(--color-primary);
-  --onboard-wallet-app-icon-border-color: none;
-  --onboard-main-scroll-container-background: #34353b;
-  --onboard-close-button-color:#2d2e33;
-  --onboard-close-button-background:var(--color-primary);
-  --onboard-font-family-normal: "Barlow";
+  --w3o-background-color: #2e2e34;
+  --w3o-foreground-color: #34353b;
+  --w3o-text-color: #e0f3ff;
+  --w3o-border-color: #3b3d43;
+  --w3o-font-family: Barlow;
 }
diff --git a/src/utils/amplitude.ts b/src/utils/amplitude.ts
index f32a2e241..fe106b295 100644
--- a/src/utils/amplitude.ts
+++ b/src/utils/amplitude.ts
@@ -248,11 +248,11 @@ export function generateTransferQuote(
   tokenInfo: TokenInfo,
   fromChainInfo: ChainInfo,
   toChainInfo: ChainInfo,
-  toAddress: string,
-  account: string,
   tokenPrice: BigNumber,
   estimatedTimeToRelayObject: ConfirmationDepositTimeType,
-  amount: BigNumber
+  amount: BigNumber,
+  account?: string,
+  toAddress?: string
 ): TransferQuoteReceivedProperties {
   // Create a function that converts a wei amount into a formatted token amount
   const formatTokens = (wei: BigNumber) =>
@@ -285,20 +285,20 @@ export function generateTransferQuote(
     fromChainId: selectedRoute.fromChain.toString(),
     fromChainName: fromChainInfo.name,
     isAmountTooLow: fees.isAmountTooLow,
-    isSenderEqRecipient: toAddress === account,
+    isSenderEqRecipient: account && toAddress ? toAddress === account : false,
     lpFeePct: formatWeiEtherPct(fees.lpFee.pct),
     lpFeeTotal: formatTokens(fees.lpFee.total),
     lpFeeTotalUsd: usdEquivalentString(fees.lpFee.total),
     quoteLatencyMilliseconds: fees.quoteLatency.toString(),
     quoteTimestamp: String(fees.quoteTimestampInMs ?? Date.now()),
-    recipient: toAddress,
+    recipient: toAddress || "not connected",
     relayFeePct: formatWeiEtherPct(fees.relayerFee.pct),
     relayFeeTotal: formatTokens(fees.relayerFee.total),
     relayFeeTotalUsd: usdEquivalentString(fees.relayerFee.total),
     relayGasFeePct: formatWeiEtherPct(fees.relayerGasFee.pct),
     relayGasFeeTotal: formatTokens(fees.relayerGasFee.total),
     relayGasFeeTotalUsd: usdEquivalentString(fees.relayerGasFee.total),
-    sender: account,
+    sender: account || "not connected",
     routeChainIdFromTo: `${fromChainInfo.chainId}-${toChainInfo.chainId}`,
     routeChainNameFromTo: `${fromChainInfo.name}-${toChainInfo.name}`,
     toAmount: formatTokens(amount.sub(totalBridgeFee)),
diff --git a/src/utils/bridge.ts b/src/utils/bridge.ts
index 7e86ded48..7cd522b38 100644
--- a/src/utils/bridge.ts
+++ b/src/utils/bridge.ts
@@ -134,7 +134,7 @@ export const getConfirmationDepositTime = (
   }
 
   // If the deposit size is above those, but is allowed by the app, we assume the pool will slow relay it.
-  return { formattedString: "~3-6 hours", lowEstimate: 180, highEstimate: 360 };
+  return { formattedString: "~2-4 hours", lowEstimate: 180, highEstimate: 360 };
 };
 
 export type AcrossDepositArgs = {
@@ -178,14 +178,32 @@ export async function sendAcrossDeposit(
   }: AcrossDepositArgs
 ): Promise<ethers.providers.TransactionResponse> {
   const config = getConfig();
-  const spokePool = config.getSpokePool(fromChain);
   const provider = getProvider(fromChain);
-  const code = await provider.getCode(spokePool.address);
-  if (!code) {
+
+  const spokePool = config.getSpokePool(fromChain);
+  const spokePoolVerifier = config.getSpokePoolVerifier(fromChain);
+
+  // If the spoke pool verifier is enabled, use it for native transfers.
+  const shouldUseSpokePoolVerifier = Boolean(spokePoolVerifier) && isNative;
+
+  if (shouldUseSpokePoolVerifier) {
+    const spokePoolVerifierCode = await provider.getCode(
+      spokePoolVerifier!.address
+    );
+    if (!spokePoolVerifierCode || spokePoolVerifierCode === "0x") {
+      throw new Error(
+        `SpokePoolVerifier not deployed at ${spokePoolVerifier!.address}`
+      );
+    }
+  }
+
+  const spokePoolCode = await provider.getCode(spokePool.address);
+  if (!spokePoolCode || spokePoolCode === "0x") {
     throw new Error(`SpokePool not deployed at ${spokePool.address}`);
   }
+
   const value = isNative ? amount : ethers.constants.Zero;
-  const tx = await spokePool.populateTransaction.deposit(
+  const commonArgs = [
     recipient,
     tokenAddress,
     amount,
@@ -194,8 +212,16 @@ export async function sendAcrossDeposit(
     quoteTimestamp,
     message,
     maxCount,
-    { value }
-  );
+    { value },
+  ] as const;
+
+  const tx = shouldUseSpokePoolVerifier
+    ? await config
+        .getSpokePoolVerifier(fromChain)!
+        .populateTransaction.deposit(spokePool.address, ...commonArgs)
+    : await config
+        .getSpokePool(fromChain)
+        .populateTransaction.deposit(...commonArgs);
 
   // do not tag a referrer if data is not provided as a hex string.
   tx.data =
diff --git a/src/utils/config.ts b/src/utils/config.ts
index 03d423623..21d7346a2 100644
--- a/src/utils/config.ts
+++ b/src/utils/config.ts
@@ -10,6 +10,8 @@ import {
   HubPool__factory,
   SpokePool,
   SpokePool__factory,
+  SpokePoolVerifier,
+  SpokePoolVerifier__factory,
   AcrossMerkleDistributor,
   AcrossMerkleDistributor__factory,
   AcceleratingDistributor,
@@ -34,6 +36,8 @@ export class ConfigClient {
   public readonly spokeChains: Set<number> = new Set();
   public readonly fromChains: Set<number> = new Set();
   public readonly toChains: Set<number> = new Set();
+  public readonly enabledChainsSpokePoolVerifier: Set<number> = new Set();
+  public readonly spokePoolVerifierAddress: string = "";
   public tokenOrder: Record<string, number> = {};
   public chainOrder: Record<string, number> = {};
   public routes: constants.Routes = [];
@@ -71,8 +75,11 @@ export class ConfigClient {
         this.tokenOrder[route.fromTokenSymbol] + this.chainOrder[route.toChain]
       );
     });
-    // prioritize routes based on token symbol and tochain. This just gives us better route prioritization when filtering a fromChain
     this.pools = this.config.pools;
+    this.enabledChainsSpokePoolVerifier = new Set(
+      this.config.spokePoolVerifier.enabledChains || []
+    );
+    this.spokePoolVerifierAddress = this.config.spokePoolVerifier.address;
   }
   getWethAddress(): string {
     return this.config.hubPoolWethAddress;
@@ -105,6 +112,25 @@ export class ConfigClient {
     const provider = signer ?? providerUtils.getProvider(chainId);
     return SpokePool__factory.connect(address, provider);
   }
+  getSpokePoolVerifierAddress(chainId: constants.ChainId): string | undefined {
+    if (!this.enabledChainsSpokePoolVerifier.has(chainId)) {
+      return undefined;
+    }
+    return this.spokePoolVerifierAddress;
+  }
+  getSpokePoolVerifier(
+    chainId: constants.ChainId,
+    signer?: Signer
+  ): SpokePoolVerifier | undefined {
+    const address = this.getSpokePoolVerifierAddress(chainId);
+
+    if (!address) {
+      return undefined;
+    }
+
+    const provider = signer ?? providerUtils.getProvider(chainId);
+    return SpokePoolVerifier__factory.connect(address, provider);
+  }
   getHubPoolChainId(): constants.ChainId {
     return this.config.hubPoolChain;
   }
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index 76e77e02a..227602a1e 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -1,6 +1,7 @@
 import assert from "assert";
 import { ethers, providers } from "ethers";
-import { constants, utils } from "@across-protocol/sdk-v2";
+import { utils } from "@across-protocol/sdk-v2";
+import { CHAIN_IDs, TOKEN_SYMBOLS_MAP } from "@across-protocol/constants-v2";
 import * as superstruct from "superstruct";
 
 import { parseEtherLike } from "./format";
@@ -30,18 +31,18 @@ import GoerliRoutes from "data/routes_5_0x0e2817C49698cc0874204AeDf7c72Be2Bb7fCD
 
 /* Chains and Tokens section */
 export enum ChainId {
-  MAINNET = constants.CHAIN_IDs.MAINNET,
-  OPTIMISM = constants.CHAIN_IDs.OPTIMISM,
-  ARBITRUM = constants.CHAIN_IDs.ARBITRUM,
-  POLYGON = constants.CHAIN_IDs.POLYGON,
-  ZK_SYNC = constants.CHAIN_IDs.ZK_SYNC,
-  BASE = constants.CHAIN_IDs.BASE,
+  MAINNET = CHAIN_IDs.MAINNET,
+  OPTIMISM = CHAIN_IDs.OPTIMISM,
+  ARBITRUM = CHAIN_IDs.ARBITRUM,
+  POLYGON = CHAIN_IDs.POLYGON,
+  ZK_SYNC = CHAIN_IDs.ZK_SYNC,
+  BASE = CHAIN_IDs.BASE,
   // testnets
-  ARBITRUM_GOERLI = constants.CHAIN_IDs.ARBITRUM_GOERLI,
-  ZK_SYNC_GOERLI = constants.CHAIN_IDs.ZK_SYNC_GOERLI,
-  BASE_GOERLI = constants.CHAIN_IDs.BASE_GOERLI,
-  GOERLI = constants.CHAIN_IDs.GOERLI,
-  MUMBAI = constants.CHAIN_IDs.MUMBAI,
+  ARBITRUM_GOERLI = CHAIN_IDs.ARBITRUM_GOERLI,
+  ZK_SYNC_GOERLI = CHAIN_IDs.ZK_SYNC_GOERLI,
+  BASE_GOERLI = CHAIN_IDs.BASE_GOERLI,
+  GOERLI = CHAIN_IDs.GOERLI,
+  MUMBAI = CHAIN_IDs.MUMBAI,
 }
 
 // Maps `ChainId` to an object and inverts the Key/Value
@@ -125,7 +126,7 @@ export type ChainInfoList = ChainInfo[];
 export type ChainInfoTable = Record<number, ChainInfo>;
 
 export const defaultBlockPollingInterval =
-  Number(process.env.REACT_APP_DEFAULT_BLOCK_POLLING_INTERVAL_S || 30) * 1000;
+  Number(process.env.REACT_APP_DEFAULT_BLOCK_POLLING_INTERVAL_S || 15) * 1000;
 export const hubPoolChainId = Number(
   process.env.REACT_APP_HUBPOOL_CHAINID || 1
 );
@@ -192,7 +193,7 @@ export const chainInfoList: ChainInfoList = [
       "https://explorer.zksync.io"
     ),
     nativeCurrencySymbol: "ETH",
-    pollingInterval: defaultBlockPollingInterval,
+    pollingInterval: 10_000,
   },
   {
     name: "Base",
@@ -203,7 +204,7 @@ export const chainInfoList: ChainInfoList = [
     explorerUrl: "https://basescan.org",
     constructExplorerLink: defaultConstructExplorerLink("https://basescan.org"),
     nativeCurrencySymbol: "ETH",
-    pollingInterval: defaultBlockPollingInterval,
+    pollingInterval: 10_000,
   },
   // testnets
   {
@@ -348,7 +349,7 @@ export const tokenList = [
   ...Object.entries(orderedTokenSymbolLogoMap).flatMap(([symbol, logoURI]) => {
     // NOTE: Handle cases for bridged USDC such as USDC.e or USDbC.
     if (bridgedUSDCSymbols.includes(symbol)) {
-      const usdcTokenInfo = constants.TOKEN_SYMBOLS_MAP.USDC;
+      const usdcTokenInfo = TOKEN_SYMBOLS_MAP.USDC;
       return {
         ...usdcTokenInfo,
         logoURI,
@@ -359,9 +360,7 @@ export const tokenList = [
     }
 
     const tokenInfo =
-      constants.TOKEN_SYMBOLS_MAP[
-        symbol as keyof typeof constants.TOKEN_SYMBOLS_MAP
-      ];
+      TOKEN_SYMBOLS_MAP[symbol as keyof typeof TOKEN_SYMBOLS_MAP];
 
     if (!tokenInfo) {
       return [];
@@ -480,7 +479,7 @@ export const getToken = (symbol: string): TokenInfo => {
  * @returns The token info for the token with the given address
  */
 export const getTokenByAddress = (address: string): TokenInfo => {
-  const token = Object.values(constants.TOKEN_SYMBOLS_MAP).find((token) =>
+  const token = Object.values(TOKEN_SYMBOLS_MAP).find((token) =>
     Object.values(token.addresses).includes(address)
   );
   assert(token, "No token found for address: " + address);
@@ -501,10 +500,15 @@ const PoolSS = superstruct.object({
   tokenSymbol: superstruct.string(),
   isNative: superstruct.boolean(),
 });
+const SpokePoolVerifierSS = superstruct.object({
+  enabledChains: superstruct.array(superstruct.number()),
+  address: superstruct.string(),
+});
 const PoolsSS = superstruct.array(PoolSS);
 const RouteConfigSS = superstruct.type({
   routes: RoutesSS,
   pools: PoolsSS,
+  spokePoolVerifier: SpokePoolVerifierSS,
   hubPoolWethAddress: superstruct.string(),
   hubPoolChain: superstruct.number(),
   hubPoolAddress: superstruct.string(),
@@ -518,6 +522,7 @@ export type Route = superstruct.Infer<typeof RouteSS>;
 export type Routes = superstruct.Infer<typeof RoutesSS>;
 export type Pool = superstruct.Infer<typeof PoolSS>;
 export type Pools = superstruct.Infer<typeof PoolsSS>;
+export type SpokePoolVerifier = superstruct.Infer<typeof SpokePoolVerifierSS>;
 export function getRoutes(chainId: ChainId): RouteConfig {
   if (chainId === ChainId.MAINNET) {
     superstruct.assert(MainnetRoutes, RouteConfigSS);
diff --git a/src/utils/onboard.ts b/src/utils/onboard.ts
index 5e8183270..845a79f2c 100644
--- a/src/utils/onboard.ts
+++ b/src/utils/onboard.ts
@@ -10,7 +10,7 @@ import {
   chainInfoList,
   providerUrlsTable,
 } from "utils";
-import logo from "assets/across-logo-v2.svg";
+import logo from "assets/across.svg";
 
 const injected = injectedModule();
 const gnosis = gnosisModule();
diff --git a/src/utils/typechain.ts b/src/utils/typechain.ts
index 7a3f74238..2dce307b8 100644
--- a/src/utils/typechain.ts
+++ b/src/utils/typechain.ts
@@ -6,6 +6,7 @@
 export { AcrossMerkleDistributor__factory } from "@across-protocol/contracts-v2/dist/typechain/factories/contracts/merkle-distributor/AcrossMerkleDistributor__factory";
 export { HubPool__factory } from "@across-protocol/contracts-v2/dist/typechain/factories/contracts/HubPool__factory";
 export { SpokePool__factory } from "@across-protocol/contracts-v2/dist/typechain/factories/contracts/SpokePool.sol/SpokePool__factory";
+export { SpokePoolVerifier__factory } from "@across-protocol/contracts-v2/dist/typechain/factories/contracts/SpokePoolVerifier__factory";
 export { ERC20__factory } from "@across-protocol/contracts-v2/dist/typechain/factories/@openzeppelin/contracts/token/ERC20/ERC20__factory";
 export { AcceleratingDistributor__factory } from "@across-protocol/across-token/dist/typechain/factories/AcceleratingDistributor__factory";
 export { ClaimAndStake__factory } from "@across-protocol/across-token/dist/typechain/factories/ClaimAndStake__factory";
@@ -13,6 +14,7 @@ export { ClaimAndStake__factory } from "@across-protocol/across-token/dist/typec
 export type { AcrossMerkleDistributor } from "@across-protocol/contracts-v2/dist/typechain/contracts/merkle-distributor/AcrossMerkleDistributor";
 export type { HubPool } from "@across-protocol/contracts-v2/dist/typechain/contracts/HubPool";
 export type { SpokePool } from "@across-protocol/contracts-v2/dist/typechain/contracts/SpokePool.sol/SpokePool";
+export type { SpokePoolVerifier } from "@across-protocol/contracts-v2/dist/typechain/contracts/SpokePoolVerifier";
 export type { AcceleratingDistributor } from "@across-protocol/across-token/dist/typechain/AcceleratingDistributor";
 export type { ClaimAndStake } from "@across-protocol/across-token/dist/typechain/ClaimAndStake";
 export type {
diff --git a/src/views/Bridge/components/AmountInput.tsx b/src/views/Bridge/components/AmountInput.tsx
index d37ec8e44..b3ff6f3f4 100644
--- a/src/views/Bridge/components/AmountInput.tsx
+++ b/src/views/Bridge/components/AmountInput.tsx
@@ -28,10 +28,10 @@ export function AmountInput({
   validationError,
 }: Props) {
   const [displayBalance, setDisplayBalance] = useState(false);
-  const [didFocus, setDidFocus] = useState(false);
+  const [didEnter, setDidEnter] = useState(false);
 
   useEffect(() => {
-    setDidFocus(false);
+    setDidEnter(false);
   }, [selectedRoute.fromTokenSymbol]);
 
   const token = getToken(selectedRoute.fromTokenSymbol);
@@ -40,7 +40,7 @@ export function AmountInput({
 
   return (
     <AmountExternalWrapper>
-      <AmountWrapper valid={didFocus ? isAmountValid : true}>
+      <AmountWrapper valid={didEnter ? isAmountValid : true}>
         <AmountInnerWrapper>
           <AmountInnerWrapperTextStack>
             {balance && (displayBalance || amountInput) && (
@@ -50,15 +50,20 @@ export function AmountInput({
               </Text>
             )}
             <AmountInnerInput
-              valid={didFocus ? isAmountValid : true}
+              type="number"
+              valid={didEnter ? isAmountValid : true}
               placeholder="Enter amount"
               value={amountInput}
-              onChange={(e) => onChangeAmountInput(e.target.value)}
+              onChange={(e) => {
+                if (!didEnter) {
+                  setDidEnter(true);
+                }
+                onChangeAmountInput(e.target.value);
+              }}
               onFocus={() => {
                 setDisplayBalance(true);
               }}
               onBlur={() => {
-                setDidFocus(true);
                 setDisplayBalance(false);
               }}
               data-cy="bridge-amount-input"
@@ -66,7 +71,6 @@ export function AmountInput({
           </AmountInnerWrapperTextStack>
           <MaxButtonWrapper
             onClick={() => {
-              setDidFocus(true);
               onClickMaxBalance();
             }}
             disabled={!balance}
@@ -75,7 +79,7 @@ export function AmountInput({
           </MaxButtonWrapper>
         </AmountInnerWrapper>
       </AmountWrapper>
-      {didFocus && !isAmountValid && (
+      {didEnter && !isAmountValid && (
         <BridgeInputErrorAlert>
           {validationError === AmountInputError.INSUFFICIENT_BALANCE &&
             "Insufficient balance to process this transfer."}
@@ -205,4 +209,14 @@ const AmountInnerInput = styled.input<IValidInput>`
     font-size: 16px;
     line-height: 20px;
   }
+
+  // hide number input arrows
+  /* Chrome, Safari, Edge, Opera */
+  ::-webkit-outer-spin-button,
+  ::-webkit-inner-spin-button {
+    -webkit-appearance: none;
+    margin: 0;
+  }
+  /* Firefox */
+  -moz-appearance: textfield;
 `;
diff --git a/src/views/Bridge/components/DepositConfirmation.tsx b/src/views/Bridge/components/DepositConfirmation.tsx
index cac37d480..cf883c253 100644
--- a/src/views/Bridge/components/DepositConfirmation.tsx
+++ b/src/views/Bridge/components/DepositConfirmation.tsx
@@ -2,7 +2,13 @@ import styled from "@emotion/styled";
 import BgBanner from "assets/bg-banners/deposit-banner.svg";
 import { Text } from "components";
 import { ReactComponent as CheckStarIcon } from "assets/check-star-ring-opaque-filled.svg";
-import { ChainId, GetBridgeFeesResult, getToken, receiveAmount } from "utils";
+import {
+  ChainId,
+  GetBridgeFeesResult,
+  QUERIESV2,
+  getToken,
+  receiveAmount,
+} from "utils";
 import { ReactComponent as ExternalLinkIcon } from "assets/icons/arrow-external-link-16.svg";
 import EstimatedTable from "./EstimatedTable";
 import { BigNumber } from "ethers";
@@ -251,6 +257,11 @@ const StyledCheckStarIcon = styled(CheckStarIcon)<{ completed?: boolean }>`
     transition: stroke 0.5s ease-in-out;
   }
   flex-shrink: 0;
+
+  @media ${QUERIESV2.sm.andDown} {
+    width: 52px;
+    height: 52px;
+  }
 `;
 
 const AnimatedDivider = styled.div<{ completed?: boolean }>`
@@ -281,6 +292,11 @@ const AnimatedLogoWrapper = styled.div<{ completed?: boolean }>`
   border-radius: 100px;
 
   flex-shrink: 0;
+
+  @media ${QUERIESV2.sm.andDown} {
+    width: 40px;
+    height: 40px;
+  }
 `;
 
 const ActionCardContainer = styled.div`
@@ -290,6 +306,10 @@ const ActionCardContainer = styled.div`
   padding: 0px;
   gap: 16px;
   width: 100%;
+
+  @media ${QUERIESV2.sm.andDown} {
+    flex-direction: column;
+  }
 `;
 
 const ActionCard = styled.div`
@@ -375,4 +395,14 @@ const AnimatedLogo = styled.div<{
       fill: ${({ completed }) => (completed ? "#6cf9d8" : "#9daab3")};
     }
   }
+
+  @media ${QUERIESV2.sm.andDown} {
+    width: 32px;
+    height: 32px;
+
+    & svg {
+      width: 32px;
+      height: 32px;
+    }
+  }
 `;
diff --git a/src/views/Bridge/components/RouteNotSupportedTooltipText.tsx b/src/views/Bridge/components/RouteNotSupportedTooltipText.tsx
index 713628d9b..da556f7a4 100644
--- a/src/views/Bridge/components/RouteNotSupportedTooltipText.tsx
+++ b/src/views/Bridge/components/RouteNotSupportedTooltipText.tsx
@@ -1,4 +1,4 @@
-import { constants } from "@across-protocol/sdk-v2";
+import { CHAIN_IDs } from "@across-protocol/constants-v2";
 
 import { Text } from "components/Text";
 import { getChainInfo } from "utils";
@@ -15,8 +15,7 @@ export const RouteNotSupportedTooltipText = ({
   toChain,
 }: Props) => {
   const isArbitrumNativeUSDC =
-    (fromChain === constants.CHAIN_IDs.ARBITRUM ||
-      toChain === constants.CHAIN_IDs.ARBITRUM) &&
+    (fromChain === CHAIN_IDs.ARBITRUM || toChain === CHAIN_IDs.ARBITRUM) &&
     symbol === "USDC";
   return (
     <Text color="white-70" size="sm">
diff --git a/src/views/Bridge/hooks/useBridge.ts b/src/views/Bridge/hooks/useBridge.ts
index 5bb4b0097..6b4edcab7 100644
--- a/src/views/Bridge/hooks/useBridge.ts
+++ b/src/views/Bridge/hooks/useBridge.ts
@@ -1,8 +1,9 @@
-import { BigNumber } from "ethers";
 import { useCallback, useEffect, useState } from "react";
+import { utils } from "@across-protocol/sdk-v2";
 
-import { useConnection, useIsWrongNetwork } from "hooks";
+import { useConnection, useIsWrongNetwork, useAmplitude } from "hooks";
 import useReferrer from "hooks/useReferrer";
+import { ampli } from "ampli";
 
 import { useBridgeAction } from "./useBridgeAction";
 import { useBridgeDepositTracking } from "./useBridgeDepositTracking";
@@ -13,11 +14,15 @@ import { useAmountInput, useValidAmount } from "./useAmountInput";
 
 export function useBridge() {
   const [shouldUpdateQuote, setShouldUpdateQuote] = useState(true);
+  const [usedTransferQuote, setUsedTransferQuote] =
+    useState<ReturnType<typeof useTransferQuote>["data"]>();
 
   const { isConnected, chainId: walletChainId, account } = useConnection();
 
   const { referrer } = useReferrer();
 
+  const { addToAmpliQueue } = useAmplitude();
+
   const {
     selectedRoute,
     handleQuickSwap,
@@ -47,21 +52,21 @@ export function useBridge() {
 
   const { toAccount, setCustomToAddress } = useToAccount(selectedRoute.toChain);
 
+  const { data: transferQuote, isLoading: isQuoteLoading } = useTransferQuote(
+    selectedRoute,
+    parsedAmount?.gt(0) ? parsedAmount : utils.bnZero,
+    account,
+    toAccount?.address
+  );
+
   const {
-    estimatedTime,
     quote,
-    initialQuoteTime,
+    quotePriceUSD,
     quotedFees,
     quotedLimits,
-    quotePriceUSD,
-    isQuoteLoading,
-  } = useTransferQuote(
-    selectedRoute,
-    parsedAmount?.gt(0) ? parsedAmount : BigNumber.from(0),
-    account,
-    toAccount?.address,
-    shouldUpdateQuote
-  );
+    initialQuoteTime,
+    estimatedTime,
+  } = usedTransferQuote || {};
 
   const { amountValidationError, isAmountValid } = useValidAmount(
     parsedAmount,
@@ -104,10 +109,32 @@ export function useBridge() {
   }, [selectedRoute.fromChain, isConnected, checkWrongNetworkHandler]);
 
   useEffect(() => {
-    if (bridgeAction.isButtonActionLoading || trackingTxHash) {
+    if (shouldUpdateQuote && !isQuoteLoading) {
+      setUsedTransferQuote(transferQuote);
+
+      if (transferQuote?.quote) {
+        addToAmpliQueue(() => {
+          ampli.transferQuoteReceived(transferQuote?.quote);
+        });
+      }
+    }
+  }, [transferQuote, shouldUpdateQuote, isQuoteLoading, addToAmpliQueue]);
+
+  useEffect(() => {
+    if (
+      shouldUpdateQuote &&
+      (bridgeAction.isButtonActionLoading || trackingTxHash)
+    ) {
       setShouldUpdateQuote(false);
+    } else if (bridgeAction.didActionError && !shouldUpdateQuote) {
+      setShouldUpdateQuote(true);
     }
-  }, [bridgeAction.isButtonActionLoading, trackingTxHash]);
+  }, [
+    shouldUpdateQuote,
+    bridgeAction.isButtonActionLoading,
+    trackingTxHash,
+    bridgeAction.didActionError,
+  ]);
 
   const handleClickNewTx = useCallback(() => {
     clearInput();
diff --git a/src/views/Bridge/hooks/useBridgeAction.ts b/src/views/Bridge/hooks/useBridgeAction.ts
index 82aca136c..05be8b043 100644
--- a/src/views/Bridge/hooks/useBridgeAction.ts
+++ b/src/views/Bridge/hooks/useBridgeAction.ts
@@ -67,7 +67,7 @@ export function useBridgeAction(
       !frozenTokenPrice ||
       !tokenSymbol
     ) {
-      return;
+      throw new Error("Missing required data for bridge action");
     }
 
     if (isWrongNetwork) {
@@ -90,21 +90,17 @@ export function useBridgeAction(
     let succeeded = false;
     let timeSigned: number | undefined = undefined;
     let tx: ContractTransaction | undefined = undefined;
-    try {
-      addToAmpliQueue(() => {
-        // Instrument amplitude before sending the transaction for the submit button.
-        ampli.transferSubmitted(
-          generateTransferSubmitted(
-            frozenQuote,
-            referrer,
-            frozenInitialQuoteTime
-          )
-        );
-      });
-      const timeSubmitted = Date.now();
+    addToAmpliQueue(() => {
+      // Instrument amplitude before sending the transaction for the submit button.
+      ampli.transferSubmitted(
+        generateTransferSubmitted(frozenQuote, referrer, frozenInitialQuoteTime)
+      );
+    });
+    const timeSubmitted = Date.now();
 
-      tx = await sendAcrossDeposit(signer, frozenPayload);
+    tx = await sendAcrossDeposit(signer, frozenPayload);
 
+    try {
       // Instrument amplitude after signing the transaction for the submit button.
       timeSigned = Date.now();
       addToAmpliQueue(() => {
@@ -184,6 +180,7 @@ export function useBridgeAction(
     isConnected,
     buttonActionHandler: buttonActionHandler.mutate,
     isButtonActionLoading: buttonActionHandler.isLoading,
+    didActionError: buttonActionHandler.isError,
     buttonLabel: getButtonLabel({
       isConnected,
       isDataLoading: dataLoading,
diff --git a/src/views/Bridge/hooks/useBridgeDepositTracking.ts b/src/views/Bridge/hooks/useBridgeDepositTracking.ts
index 35db91845..ea04da289 100644
--- a/src/views/Bridge/hooks/useBridgeDepositTracking.ts
+++ b/src/views/Bridge/hooks/useBridgeDepositTracking.ts
@@ -1,6 +1,6 @@
 import { useConnection } from "hooks";
 import { useCallback, useEffect, useState } from "react";
-import { formatMilliseconds, getChainInfo } from "utils";
+import { formatSeconds, getChainInfo } from "utils";
 
 export function useBridgeDepositTracking() {
   const [txHash, setTxHash] = useState<string | undefined>(undefined);
@@ -44,8 +44,8 @@ export function useBridgeDepositTracking() {
   }, [startDate, depositFinishedDate]);
 
   const trackingTxHash = !!txHash;
-  const elapsedTimeAsFormattedString = formatMilliseconds(
-    Math.floor((elapsedSeconds ?? 0) * 1000)
+  const elapsedTimeAsFormattedString = formatSeconds(
+    Math.floor(elapsedSeconds ?? 0)
   );
 
   const depositFinished = !!depositFinishedDate;
diff --git a/src/views/Bridge/hooks/useTransferQuote.ts b/src/views/Bridge/hooks/useTransferQuote.ts
index 5378c17ac..be997a2e3 100644
--- a/src/views/Bridge/hooks/useTransferQuote.ts
+++ b/src/views/Bridge/hooks/useTransferQuote.ts
@@ -1,45 +1,26 @@
-import { useEffect, useState } from "react";
+import { useState } from "react";
 import { BigNumber } from "ethers";
+import { useQuery } from "react-query";
 
 import {
-  GetBridgeFeesResult,
   getToken,
   getChainInfo,
   generateTransferQuote,
-  ConfirmationDepositTimeType,
   getConfirmationDepositTime,
   Route,
 } from "utils";
-import { BridgeLimitInterface } from "utils/serverless-api/types";
-import { useAmplitude, useBridgeFees, useBridgeLimits } from "hooks";
+import { useBridgeFees, useBridgeLimits } from "hooks";
 import { useCoingeckoPrice } from "hooks/useCoingeckoPrice";
-import { ampli, TransferQuoteReceivedProperties } from "ampli";
 
 export function useTransferQuote(
   selectedRoute: Route,
   amountToBridge: BigNumber,
   fromAddress?: string,
-  toAddress?: string,
-  shouldUpdateQuote?: boolean
+  toAddress?: string
 ) {
-  const [quotedFees, setQuotedFees] = useState<
-    GetBridgeFeesResult | undefined
-  >();
-  const [quotedLimits, setQuotedLimits] = useState<
-    BridgeLimitInterface | undefined
-  >();
-  const [quotePriceUSD, setQuotedPriceUSD] = useState<BigNumber | undefined>();
-  const [quote, setQuote] = useState<
-    TransferQuoteReceivedProperties | undefined
-  >();
   const [initialQuoteTime, setInitialQuoteTime] = useState<
     number | undefined
   >();
-  const [estimatedTime, setEstimatedTime] = useState<
-    ConfirmationDepositTimeType | undefined
-  >();
-
-  const { addToAmpliQueue } = useAmplitude();
 
   const feesQuery = useBridgeFees(
     amountToBridge,
@@ -54,91 +35,71 @@ export function useTransferQuote(
   );
   const usdPriceQuery = useCoingeckoPrice(selectedRoute.l1TokenAddress, "usd");
 
-  useEffect(() => {
-    if (shouldUpdateQuote || !quotedFees) {
-      setQuotedFees(feesQuery.fees);
-    }
-    if (shouldUpdateQuote || !quotedLimits) {
-      setQuotedLimits(limitsQuery.limits);
-    }
-    if (shouldUpdateQuote || !quotedLimits) {
-      setQuotedPriceUSD(usdPriceQuery.data?.price);
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [
-    feesQuery.fees,
-    limitsQuery.limits,
-    usdPriceQuery.data,
-    shouldUpdateQuote,
-  ]);
+  return useQuery({
+    queryKey: [
+      "quote",
+      feesQuery.fees?.quoteBlock.toString(),
+      selectedRoute.fromChain,
+      selectedRoute.toChain,
+      selectedRoute.fromTokenSymbol,
+      amountToBridge.toString(),
+    ],
+    enabled: Boolean(
+      feesQuery.fees && limitsQuery.limits && usdPriceQuery.data?.price
+    ),
+    queryFn: async () => {
+      if (
+        !feesQuery.fees ||
+        !limitsQuery.limits ||
+        !usdPriceQuery.data?.price ||
+        amountToBridge.lte(0)
+      ) {
+        return {
+          estimatedTime: undefined,
+          quote: undefined,
+          initialQuoteTime: undefined,
+          quotedFees: undefined,
+          quotedLimits: undefined,
+          quotePriceUSD: undefined,
+        };
+      }
 
-  useEffect(() => {
-    if (quotedLimits && amountToBridge.gt(0)) {
-      setEstimatedTime(
-        getConfirmationDepositTime(
-          amountToBridge,
-          quotedLimits,
-          selectedRoute.toChain,
-          selectedRoute.fromChain
-        )
-      );
-    }
-  }, [
-    amountToBridge,
-    quotedLimits,
-    selectedRoute.fromChain,
-    selectedRoute.toChain,
-  ]);
-
-  useEffect(() => {
-    if (
-      quotedFees &&
-      fromAddress &&
-      toAddress &&
-      usdPriceQuery?.data?.price &&
-      estimatedTime &&
-      amountToBridge
-    ) {
       const tokenInfo = getToken(selectedRoute.fromTokenSymbol);
       const fromChainInfo = getChainInfo(selectedRoute.fromChain);
       const toChainInfo = getChainInfo(selectedRoute.toChain);
+      const estimatedTime = getConfirmationDepositTime(
+        amountToBridge,
+        limitsQuery.limits,
+        selectedRoute.toChain,
+        selectedRoute.fromChain
+      );
       const quote = generateTransferQuote(
-        quotedFees,
+        feesQuery.fees,
         selectedRoute,
         tokenInfo,
         fromChainInfo,
         toChainInfo,
-        toAddress,
-        fromAddress,
         usdPriceQuery.data.price,
         estimatedTime,
-        amountToBridge
+        amountToBridge,
+        fromAddress,
+        toAddress
       );
-      addToAmpliQueue(() => {
-        ampli.transferQuoteReceived(quote);
-      });
-      setQuote(quote);
-      setInitialQuoteTime((s) => s ?? Date.now());
-    }
-  }, [
-    quotedFees,
-    selectedRoute,
-    amountToBridge,
-    fromAddress,
-    toAddress,
-    usdPriceQuery?.data?.price,
-    estimatedTime,
-    addToAmpliQueue,
-  ]);
 
-  return {
-    estimatedTime,
-    quote,
-    initialQuoteTime,
-    quotedFees,
-    quotedLimits,
-    quotePriceUSD,
-    isQuoteLoading:
-      feesQuery.isLoading || limitsQuery.isLoading || usdPriceQuery.isLoading,
-  };
+      let initialQuoteTimeToUse = initialQuoteTime || Date.now();
+
+      if (!initialQuoteTime) {
+        setInitialQuoteTime((s) => s ?? initialQuoteTimeToUse);
+      }
+
+      return {
+        estimatedTime,
+        quote,
+        initialQuoteTime: initialQuoteTimeToUse,
+        quotedFees: feesQuery.fees,
+        quotedLimits: limitsQuery.limits,
+        quotePriceUSD: usdPriceQuery.data.price,
+      };
+    },
+  });
 }
diff --git a/src/views/Rewards/components/GenericStakingPoolTable/GenericStakingPoolTable.styles.tsx b/src/views/Rewards/components/GenericStakingPoolTable/GenericStakingPoolTable.styles.tsx
index dba062f5d..a4d04f4fb 100644
--- a/src/views/Rewards/components/GenericStakingPoolTable/GenericStakingPoolTable.styles.tsx
+++ b/src/views/Rewards/components/GenericStakingPoolTable/GenericStakingPoolTable.styles.tsx
@@ -25,17 +25,15 @@ export const HeaderCell = styled(Cell)`
 export const StyledConnectorVector = styled(ConnectorVector)``;
 
 export const RowCell = styled(Cell)`
-  padding: 24px;
+  padding: 24px 16px;
   background: transparent;
   border-top: 1px solid #3e4047;
 `;
 
 const BaseCell = styled.div`
-  margin-left: -8px;
   width: calc(100%);
 
   @media ${QUERIESV2.sm.andDown} {
-    margin-left: -8px;
   }
 `;
 
diff --git a/src/views/Staking/components/StakingInputBlock/StakingInputBlock.styles.tsx b/src/views/Staking/components/StakingInputBlock/StakingInputBlock.styles.tsx
index 8f4b4d1ff..81889a3e5 100644
--- a/src/views/Staking/components/StakingInputBlock/StakingInputBlock.styles.tsx
+++ b/src/views/Staking/components/StakingInputBlock/StakingInputBlock.styles.tsx
@@ -20,7 +20,7 @@ export const InputRow = styled.div`
     flex-shrink: 0;
   }
 
-  @media ${QUERIESV2.sm.andDown} {
+  @media ${QUERIESV2.xs.andDown} {
     flex-direction: column;
     gap: 12px;
   }
@@ -101,7 +101,7 @@ export const MaxButton = styled(UnstyledButton)`
 
 export const ButtonWrapper = styled.div`
   flex-grow: 1;
-  @media ${QUERIESV2.sm.andDown} {
+  @media ${QUERIESV2.xs.andDown} {
     width: 100%;
   }
 `;
diff --git a/src/views/Transactions/components/SpeedUpModal/InputWithButton.tsx b/src/views/Transactions/components/SpeedUpModal/InputWithButton.tsx
index eb7b908ff..3419b3f91 100644
--- a/src/views/Transactions/components/SpeedUpModal/InputWithButton.tsx
+++ b/src/views/Transactions/components/SpeedUpModal/InputWithButton.tsx
@@ -1,6 +1,9 @@
 import React, { useState } from "react";
 import styled from "@emotion/styled";
 
+import { QUERIESV2 } from "utils";
+import { Text } from "components/Text";
+
 type Props = React.HTMLProps<HTMLInputElement> & {
   label?: string;
   error?: string;
@@ -20,7 +23,11 @@ export function InputWithButton({
   return (
     <Container>
       <InputContainer>
-        {label && <label>{label}</label>}
+        {label && (
+          <label>
+            <Text>{label}</Text>
+          </label>
+        )}
         <InputWithButtonContainer
           isInputFocused={isInputFocused}
           hasError={Boolean(error)}
@@ -39,7 +46,11 @@ export function InputWithButton({
           {Button && Button}
         </InputWithButtonContainer>
       </InputContainer>
-      {error && <ErrorContainer>{error}</ErrorContainer>}
+      {error && (
+        <ErrorContainer>
+          <Text color="error">{error}</Text>
+        </ErrorContainer>
+      )}
     </Container>
   );
 }
@@ -52,11 +63,10 @@ const InputContainer = styled.div`
   align-items: center;
   gap: 16px;
 
-  label {
-    font-weight: 400;
-    font-size: ${18 / 16}rem;
-    line-height: ${26 / 16}rem;
-    color: #9daab2;
+  @media ${QUERIESV2.sm.andDown} {
+    flex-direction: column;
+    align-items: start;
+    gap: 8px;
   }
 `;
 
@@ -79,7 +89,11 @@ const InputWithButtonContainer = styled.div<{
   gap: 16px;
 
   color: #9daab2;
-  font-weight: 400;
+
+  @media ${QUERIESV2.sm.andDown} {
+    flex-direction: column;
+    width: 100%;
+  }
 
   input {
     flex: 1;
@@ -91,6 +105,10 @@ const InputWithButtonContainer = styled.div<{
     border: none;
     outline: none;
     background: transparent;
+
+    @media ${QUERIESV2.sm.andDown} {
+      width: 100%;
+    }
   }
 
   button {
@@ -117,13 +135,15 @@ const InputWithButtonContainer = styled.div<{
 `;
 
 const ErrorContainer = styled.div`
-  color: #f96c6c;
-  font-weight: 400;
-  font-size: 12px;
-  line-height: 14px;
   display: flex;
   flex-direction: row;
   justify-content: flex-end;
   align-items: center;
   padding: 8px 16px;
+
+  @media ${QUERIESV2.sm.andDown} {
+    flex-direction: column;
+    align-items: end;
+    padding: 8px 0px;
+  }
 `;
diff --git a/src/views/Transactions/components/SpeedUpModal/SpeedUpModal.styles.tsx b/src/views/Transactions/components/SpeedUpModal/SpeedUpModal.styles.tsx
index 8b12cc359..32b71b636 100644
--- a/src/views/Transactions/components/SpeedUpModal/SpeedUpModal.styles.tsx
+++ b/src/views/Transactions/components/SpeedUpModal/SpeedUpModal.styles.tsx
@@ -14,6 +14,7 @@ export const Overlay = styled(DialogOverlay)`
   justify-content: center;
   align-items: center;
   z-index: 100000;
+  overflow-y: scroll;
 `;
 
 export const Content = styled(DialogContent)`
@@ -32,6 +33,7 @@ export const SuccessContainer = styled.div`
   flex-direction: column;
   align-items: center;
   gap: 24px;
+  padding-bottom: 24px;
 
   svg {
     stroke: #6cf9d8;
@@ -97,7 +99,12 @@ export const ButtonsRow = styled.div`
   display: flex;
   flex-direction: row;
   justify-content: flex-end;
-  gap: 8px;
+`;
+
+export const CloseHeaderRow = styled.div`
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-end;
 `;
 
 export const ConfirmButton = styled(ButtonV2)<{ warning?: boolean }>`
diff --git a/src/views/Transactions/components/SpeedUpModal/SpeedUpModal.tsx b/src/views/Transactions/components/SpeedUpModal/SpeedUpModal.tsx
index d9c722413..cb9d62f3a 100644
--- a/src/views/Transactions/components/SpeedUpModal/SpeedUpModal.tsx
+++ b/src/views/Transactions/components/SpeedUpModal/SpeedUpModal.tsx
@@ -1,19 +1,20 @@
 import React, { useState, useEffect } from "react";
-import { Info, Zap } from "react-feather";
+import { Info, Zap, X } from "react-feather";
 import { BigNumber } from "ethers";
 
 import { formatWeiPct, getChainInfo } from "utils";
 import { maxRelayFee, minRelayFee } from "utils/constants";
+import { Text } from "components/Text";
 
 import {
   Overlay,
   Content,
   SuccessContainer,
   SpeedUpTxLinkContainer,
-  Title,
   InfoBox,
   ErrorBox,
   ButtonsRow,
+  CloseHeaderRow,
   CancelButton,
   ConfirmButton,
 } from "./SpeedUpModal.styles";
@@ -95,7 +96,7 @@ export function SpeedUpModal({ isOpen, onClose, txTuple }: Props) {
           <SuccessContent onClose={onClose} />
         ) : (
           <>
-            <Title>Speed up transaction</Title>
+            <Text size="xl">Speed up transaction</Text>
             <AlertBox
               isCorrectChain={!isWrongNetwork}
               speedUpError={speedUp.isError ? "Speed up failed" : undefined}
@@ -172,12 +173,12 @@ function AlertBox({
         <div>
           <Info />
         </div>
-        <p>
+        <Text color="error">
           You are on the incorrect network. Please{" "}
           <button onClick={onClickSwitch}>
             switch to {getChainInfo(sourceChainId).name}
           </button>
-        </p>
+        </Text>
       </ErrorBox>
     );
   } else if (speedUpError) {
@@ -186,7 +187,7 @@ function AlertBox({
         <div>
           <Info />
         </div>
-        <p>{speedUpError}</p>
+        <Text color="error">{speedUpError}</Text>
       </ErrorBox>
     );
   } else if (isRelayerFeeFairlyPriced) {
@@ -195,10 +196,10 @@ function AlertBox({
         <div>
           <Info />
         </div>
-        <p>
+        <Text color="warning">
           Note: The relay is already fairly priced compared to other
           transactions with similar characteristics.
-        </p>
+        </Text>
       </InfoBox>
     );
   }
@@ -209,16 +210,14 @@ function AlertBox({
 function SuccessContent({ onClose }: Pick<Props, "onClose">) {
   return (
     <>
+      <CloseHeaderRow>
+        <X size={16} onClick={onClose} />
+      </CloseHeaderRow>
       <SuccessContainer>
-        <Title>Success</Title>
+        <Text size="xl">Success</Text>
         <Zap size={64} />
-        <p>Transaction was sped up successfully.</p>
+        <Text>Transaction was sped up successfully.</Text>
       </SuccessContainer>
-      <ButtonsRow>
-        <CancelButton size="md" onClick={onClose}>
-          Close
-        </CancelButton>
-      </ButtonsRow>
     </>
   );
 }
diff --git a/src/views/Transactions/components/SpeedUpModal/SpeedUpStats.tsx b/src/views/Transactions/components/SpeedUpModal/SpeedUpStats.tsx
index 1958b5331..db66af09d 100644
--- a/src/views/Transactions/components/SpeedUpModal/SpeedUpStats.tsx
+++ b/src/views/Transactions/components/SpeedUpModal/SpeedUpStats.tsx
@@ -1,4 +1,6 @@
 import styled from "@emotion/styled";
+
+import { Text } from "components/Text";
 import { formatWeiPct, getChainInfo, makeFormatUnits } from "utils";
 
 import {
@@ -32,43 +34,47 @@ export function SpeedUpStats({
   return (
     <StatsBox>
       <StatRow>
-        <div>Asset</div>
-        <div>
+        <Text color="white-70">Asset</Text>
+        <Text color="white-70">
           {token.symbol}{" "}
           <img src={token.logoURI} alt={`token_logo_${token.symbol}`} />
-        </div>
+        </Text>
       </StatRow>
       <StatRow>
-        <div>From → To</div>
-        <div>
+        <Text color="white-70">From → To</Text>
+        <Text color="white-70">
           {getChainInfo(transfer.sourceChainId).name} →{" "}
           {getChainInfo(transfer.destinationChainId).name}
-        </div>
+        </Text>
       </StatRow>
       <StatRow>
-        <div>Amount</div>
-        <div>{formatTokenUnits(transfer.amount)}</div>
+        <Text color="white-70">Amount</Text>
+        <Text color="white-70">{formatTokenUnits(transfer.amount)}</Text>
       </StatRow>
       <StatRow>
-        <div>Current fee %</div>
-        <div>{formatWeiPct(transfer.depositRelayerFeePct)}%</div>
+        <Text color="white-70">Current fee %</Text>
+        <Text color="white-70">
+          {formatWeiPct(transfer.depositRelayerFeePct)}%
+        </Text>
       </StatRow>
       <StatRow>
-        <div>Current fee in {token.symbol}</div>
-        <div>
+        <Text color="white-70">Current fee in {token.symbol}</Text>
+        <Text color="white-70">
           {formatTokenUnits(
             calcPctOfTokenAmount(transfer.depositRelayerFeePct, transfer.amount)
           )}
-        </div>
+        </Text>
       </StatRow>
       <Divider />
       <StatRow highlightValue>
-        <div>New fee %</div>
-        <div>{hideNewFee ? "-" : appendPercentageSign(feeInput)}</div>
+        <Text color="white-70">New fee %</Text>
+        <Text color="white-70">
+          {hideNewFee ? "-" : appendPercentageSign(feeInput)}
+        </Text>
       </StatRow>
       <StatRow highlightValue>
-        <div>New fee in {token.symbol}</div>
-        <div>
+        <Text color="white-70">New fee in {token.symbol}</Text>
+        <Text color="white-70">
           {hideNewFee
             ? "-"
             : formatTokenUnits(
@@ -77,7 +83,7 @@ export function SpeedUpStats({
                   transfer.amount
                 )
               )}
-        </div>
+        </Text>
       </StatRow>
     </StatsBox>
   );
diff --git a/src/views/Transactions/components/TransactionsTable/TransactionsTable.styles.tsx b/src/views/Transactions/components/TransactionsTable/TransactionsTable.styles.tsx
index 673d5b438..42eb358ed 100644
--- a/src/views/Transactions/components/TransactionsTable/TransactionsTable.styles.tsx
+++ b/src/views/Transactions/components/TransactionsTable/TransactionsTable.styles.tsx
@@ -1,7 +1,7 @@
 import styled from "@emotion/styled";
 
 import { ReactComponent as AcrossPlusIcon } from "assets/across-plus-icon.svg";
-import { QUERIES } from "utils";
+import { QUERIESV2 } from "utils";
 import {
   BaseTableWrapper,
   BaseWrapper,
@@ -56,7 +56,7 @@ export const HeadCell = styled(BaseHeadCell)`
 export const TableLogo = styled.img`
   height: 15px;
   margin-right: 4px;
-  @media ${QUERIES.tabletAndDown} {
+  @media ${QUERIESV2.tb.andDown} {
     margin-left: 16px;
   }
 `;
@@ -139,7 +139,7 @@ export const PaginationWrapper = styled.div`
   max-width: 1425px;
   margin: auto;
 
-  @media ${QUERIES.mobileAndDown} {
+  @media ${QUERIESV2.sm.andDown} {
     padding: 0 ${20 / 16}rem;
   }
 `;
diff --git a/yarn.lock b/yarn.lock
index e0e09de4a..9d3c56b8c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -16,6 +16,11 @@
     "@uma/common" "^2.17.0"
     hardhat "^2.9.3"
 
+"@across-protocol/constants-v2@^1.0.4":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@across-protocol/constants-v2/-/constants-v2-1.0.4.tgz#df31c81038982a25de2b1b8f7604875f3de1186c"
+  integrity sha512-Nzl8Z1rZFvcpuKQu7CmBVfvgB13/NoulcsRVYBSkG90imS/e6mugxzqD9UrUb+WOL0ODMCANCAoDw54ZBBzNiQ==
+
 "@across-protocol/contracts-v2@^2.4.3":
   version "2.4.3"
   resolved "https://registry.yarnpkg.com/@across-protocol/contracts-v2/-/contracts-v2-2.4.3.tgz#9cc0b1f52b4f819b32ca1524ef84af9dfed8687a"
@@ -42,10 +47,10 @@
     "@openzeppelin/contracts" "4.1.0"
     "@uma/core" "^2.18.0"
 
-"@across-protocol/sdk-v2@^0.16.2":
-  version "0.16.2"
-  resolved "https://registry.yarnpkg.com/@across-protocol/sdk-v2/-/sdk-v2-0.16.2.tgz#bb9e38e40e5fc55ae8b8aba1a52cd2f6a0aa2b33"
-  integrity sha512-k7sj7DqdWR8ucfWR2dMigKUc6kGYPi23nngNw9V4udYmJ4NUR977yDFzwKzi3W33dB1daAuvGWCaWEg/kL/eOw==
+"@across-protocol/sdk-v2@^0.16.4":
+  version "0.16.4"
+  resolved "https://registry.yarnpkg.com/@across-protocol/sdk-v2/-/sdk-v2-0.16.4.tgz#89ef2dc46fae9647ed46fda50a4de270f925f68e"
+  integrity sha512-mpPYiW4Kb2uQXmPOmsnCqer/iSuRuixSJM91svIxwA2z3kw1xk57G94LeVSufFPzVD/5urUS/sYm7Ea0z75WSw==
   dependencies:
     "@across-protocol/across-token" "^1.0.0"
     "@across-protocol/contracts-v2" "^2.4.3"
@@ -58,6 +63,12 @@
     ethers "^5.7.2"
     lodash.get "^4.4.2"
     superstruct "^0.15.4"
+    tslib "^2.6.2"
+
+"@adraffy/ens-normalize@1.9.4":
+  version "1.9.4"
+  resolved "https://registry.yarnpkg.com/@adraffy/ens-normalize/-/ens-normalize-1.9.4.tgz#aae21cb858bbb0411949d5b7b3051f4209043f62"
+  integrity sha512-UK0bHA7hh9cR39V+4gl2/NnBBjoXIxkuWAPCaY4X7fbH4L/azIi7ilWOCjMUYfpJgraLUAqkRi2BqrjME8Rynw==
 
 "@amplitude/ampli@^1.27.1":
   version "1.27.1"
@@ -2678,10 +2689,10 @@
     exec-sh "^0.3.2"
     minimist "^1.2.0"
 
-"@coinbase/wallet-sdk@^3.6.0":
-  version "3.7.1"
-  resolved "https://registry.yarnpkg.com/@coinbase/wallet-sdk/-/wallet-sdk-3.7.1.tgz#44b3b7a925ff5cc974e4cbf7a44199ffdcf03541"
-  integrity sha512-LjyoDCB+7p0waQXfK+fUgcAs3Ezk6S6e+LYaoFjpJ6c9VTop3NyZF40Pi7df4z7QJohCwzuIDjz0Rhtig6Y7Pg==
+"@coinbase/wallet-sdk@^3.7.1":
+  version "3.7.2"
+  resolved "https://registry.yarnpkg.com/@coinbase/wallet-sdk/-/wallet-sdk-3.7.2.tgz#7a89bd9e3a06a1f26d4480d8642af33fb0c7e3aa"
+  integrity sha512-lIGvXMsgpsQWci/XOMQIJ2nIZ8JUy/L+bvC0wkRaYarr0YylwpXrJ2gRM3hCXPS477pkyO7N/kSiAoRgEXUdJQ==
   dependencies:
     "@metamask/safe-event-emitter" "2.0.0"
     "@solana/web3.js" "^1.70.1"
@@ -4539,42 +4550,11 @@
   resolved "https://registry.yarnpkg.com/@gnosis.pm/mock-contract/-/mock-contract-4.0.0.tgz#eaf500fddcab81b5f6c22280a7b22ff891dd6f87"
   integrity sha512-SkRq2KwPx6vo0LAjSc8JhgQstrQFXRyn2yqquIfub7r2WHi5nUbF8beeSSXsd36hvBcQxQfmOIYNYRpj9JOhrQ==
 
-"@gnosis.pm/safe-apps-provider@^0.9.2":
-  version "0.9.3"
-  resolved "https://registry.yarnpkg.com/@gnosis.pm/safe-apps-provider/-/safe-apps-provider-0.9.3.tgz#d8913b0f8abc15fdca229571eefc5f9385c82ea7"
-  integrity sha512-WzsfEMrOTd7/epEKs7S0QBB+sgw25d1B4SeLCD7q9RYi0vYLaeWT3jTuVXVGqwAlT3tFyedmvXnryLV5SUwiug==
-  dependencies:
-    "@gnosis.pm/safe-apps-sdk" "6.2.0"
-    events "^3.3.0"
-
-"@gnosis.pm/safe-apps-sdk@6.2.0":
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/@gnosis.pm/safe-apps-sdk/-/safe-apps-sdk-6.2.0.tgz#05751b4ae4c6cfa7e19839d3655e7d9b5fb72dfe"
-  integrity sha512-dOpVBlu+Nv7bOrOl9llTeRriEpdUnnbXEM/RgTkS1v8Q2swT6+M+WIKTuKB/cadFXbjUsBD/nd3IsihHP24b5g==
-  dependencies:
-    "@gnosis.pm/safe-react-gateway-sdk" "^2.5.6"
-    ethers "^5.4.7"
-
-"@gnosis.pm/safe-apps-sdk@^6.1.1":
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/@gnosis.pm/safe-apps-sdk/-/safe-apps-sdk-6.3.0.tgz#19f8bff136bdfdf9003745e4202e1cb85322e493"
-  integrity sha512-atUiUj1JEGnZwxDrKbuxfkwPsNQtoxnQqNjvB9cVODxSdR9OiLy5XdW2wz3Y/Gq+sjWc6lAUy3M5ovTY7qmbrg==
-  dependencies:
-    "@gnosis.pm/safe-react-gateway-sdk" "^2.8.5"
-    ethers "^5.4.7"
-
 "@gnosis.pm/safe-contracts@1.3.0", "@gnosis.pm/safe-contracts@^1.3.0":
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/@gnosis.pm/safe-contracts/-/safe-contracts-1.3.0.tgz#316741a7690d8751a1f701538cfc9ec80866eedc"
   integrity sha512-1p+1HwGvxGUVzVkFjNzglwHrLNA67U/axP0Ct85FzzH8yhGJb4t9jDjPYocVMzLorDoWAfKicGy1akPY9jXRVw==
 
-"@gnosis.pm/safe-react-gateway-sdk@^2.5.6", "@gnosis.pm/safe-react-gateway-sdk@^2.8.5":
-  version "2.10.3"
-  resolved "https://registry.yarnpkg.com/@gnosis.pm/safe-react-gateway-sdk/-/safe-react-gateway-sdk-2.10.3.tgz#4537442a78eb0508c483aabcac19296335a77ac3"
-  integrity sha512-ukaLACozdJQb2YGSAZgBUkF4CT9iKVjpnKFCKUnGGghXqp+Yyn9jpdcfFK0VYQJ6ZSwAm40tHtQaN3K9817Bcg==
-  dependencies:
-    cross-fetch "^3.1.5"
-
 "@gnosis.pm/zodiac@3.2.0":
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/@gnosis.pm/zodiac/-/zodiac-3.2.0.tgz#4cc59023332076ede901cb39563a09b8c5625568"
@@ -5355,6 +5335,13 @@
   resolved "https://registry.yarnpkg.com/@nicolo-ribaudo/semver-v6/-/semver-v6-6.3.3.tgz#ea6d23ade78a325f7a52750aab1526b02b628c29"
   integrity sha512-3Yc1fUTs69MG/uZbJlLSI3JISMn2UV2rg+1D/vROUqZyh3l6iYHCs7GMp+M40ZD7yOdDbYjJcU1oTJhrc+dGKg==
 
+"@noble/curves@1.2.0", "@noble/curves@~1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@noble/curves/-/curves-1.2.0.tgz#92d7e12e4e49b23105a2555c6984d41733d65c35"
+  integrity sha512-oYclrNgRaM9SsBUBVbb8M6DTV7ZHRTKugureoYEncY5c65HOmRzvSiTE3y5CYaPYJA/GVkrhXEoF0M3Ya9PMnw==
+  dependencies:
+    "@noble/hashes" "1.3.2"
+
 "@noble/curves@^1.0.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@noble/curves/-/curves-1.1.0.tgz#f13fc667c89184bc04cccb9b11e8e7bae27d8c3d"
@@ -5372,6 +5359,11 @@
   resolved "https://registry.yarnpkg.com/@noble/hashes/-/hashes-1.3.1.tgz#8831ef002114670c603c458ab8b11328406953a9"
   integrity sha512-EbqwksQwz9xDRGfDST86whPBgM65E0OH/pCgqW0GBVzO22bNE+NuIbeTb714+IfSjU3aRk47EUvXIb5bTsenKA==
 
+"@noble/hashes@1.3.2", "@noble/hashes@~1.3.0", "@noble/hashes@~1.3.2":
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/@noble/hashes/-/hashes-1.3.2.tgz#6f26dbc8fbc7205873ce3cee2f690eba0d421b39"
+  integrity sha512-MVC8EAQp7MvEcm30KWENFjgR+Mkmf+D189XJTkFIlwohU5hcBbn1ZkKq7KVTi2Hme3PMGF390DaL52beVrIihQ==
+
 "@noble/secp256k1@1.7.1", "@noble/secp256k1@~1.7.0":
   version "1.7.1"
   resolved "https://registry.yarnpkg.com/@noble/secp256k1/-/secp256k1-1.7.1.tgz#b251c70f824ce3ca7f8dc3df08d58f005cc0507c"
@@ -6190,11 +6182,37 @@
   resolved "https://registry.yarnpkg.com/@rushstack/eslint-patch/-/eslint-patch-1.3.2.tgz#31b9c510d8cada9683549e1dbb4284cca5001faf"
   integrity sha512-V+MvGwaHH03hYhY+k6Ef/xKd6RYlc4q8WBx+2ANmipHJcKuktNcI/NgEsJgdSUF6Lw32njT6OnrRsKYCdgHjYw==
 
+"@safe-global/safe-apps-provider@^0.18.0":
+  version "0.18.0"
+  resolved "https://registry.yarnpkg.com/@safe-global/safe-apps-provider/-/safe-apps-provider-0.18.0.tgz#81f1f00684840832e4fe2f92f26891533abd7b10"
+  integrity sha512-C6xN+rRfDn1ShF2Om08h1htuK6M6CttUdahCOSiNVdzGqW5d0nv2RHSO1IntvdQnyd5tBMo31Fy+7XrCve7ORA==
+  dependencies:
+    "@safe-global/safe-apps-sdk" "^8.1.0"
+    events "^3.3.0"
+
+"@safe-global/safe-apps-sdk@^8.1.0":
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/@safe-global/safe-apps-sdk/-/safe-apps-sdk-8.1.0.tgz#d1d0c69cd2bf4eef8a79c5d677d16971926aa64a"
+  integrity sha512-XJbEPuaVc7b9n23MqlF6c+ToYIS3f7P2Sel8f3cSBQ9WORE4xrSuvhMpK9fDSFqJ7by/brc+rmJR/5HViRr0/w==
+  dependencies:
+    "@safe-global/safe-gateway-typescript-sdk" "^3.5.3"
+    viem "^1.0.0"
+
+"@safe-global/safe-gateway-typescript-sdk@^3.5.3":
+  version "3.12.0"
+  resolved "https://registry.yarnpkg.com/@safe-global/safe-gateway-typescript-sdk/-/safe-gateway-typescript-sdk-3.12.0.tgz#aa767a32f4d10f4ec9a47ad7e32d547d3b51e94c"
+  integrity sha512-hExCo62lScVC9/ztVqYEYL2pFxcqLTvB8fj0WtdP5FWrvbtEgD0pbVolchzD5bf85pbzvEwdAxSVS7EdCZxTNw==
+
 "@scure/base@~1.1.0":
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/@scure/base/-/base-1.1.1.tgz#ebb651ee52ff84f420097055f4bf46cfba403938"
   integrity sha512-ZxOhsSyxYwLJj3pLZCefNitxsj093tb2vq90mp2txoYeBqbcjDjqFhyM8eUjq/uFm6zJ+mUuqxlS2FkuSY1MTA==
 
+"@scure/base@~1.1.2":
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/@scure/base/-/base-1.1.3.tgz#8584115565228290a6c6c4961973e0903bb3df2f"
+  integrity sha512-/+SgoRjLq7Xlf0CWuLHq2LUZeL/w65kfzAPG5NH9pcmBhs+nunQTn4gvdwgMTIXnt9b2C/1SeL2XiysZEyIC9Q==
+
 "@scure/bip32@1.1.5":
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/@scure/bip32/-/bip32-1.1.5.tgz#d2ccae16dcc2e75bc1d75f5ef3c66a338d1ba300"
@@ -6204,6 +6222,15 @@
     "@noble/secp256k1" "~1.7.0"
     "@scure/base" "~1.1.0"
 
+"@scure/bip32@1.3.2":
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/@scure/bip32/-/bip32-1.3.2.tgz#90e78c027d5e30f0b22c1f8d50ff12f3fb7559f8"
+  integrity sha512-N1ZhksgwD3OBlwTv3R6KFEcPojl/W4ElJOeCZdi+vuI5QmTFwLq3OFf2zd2ROpKvxFdgZ6hUpb0dx9bVNEwYCA==
+  dependencies:
+    "@noble/curves" "~1.2.0"
+    "@noble/hashes" "~1.3.2"
+    "@scure/base" "~1.1.2"
+
 "@scure/bip39@1.1.1":
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/@scure/bip39/-/bip39-1.1.1.tgz#b54557b2e86214319405db819c4b6a370cf340c5"
@@ -6212,6 +6239,14 @@
     "@noble/hashes" "~1.2.0"
     "@scure/base" "~1.1.0"
 
+"@scure/bip39@1.2.1":
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@scure/bip39/-/bip39-1.2.1.tgz#5cee8978656b272a917b7871c981e0541ad6ac2a"
+  integrity sha512-Z3/Fsz1yr904dduJD0NpiyRHhRYHdcnyh73FZWiV+/qhWi83wNJ3NWolYqCEN+ZWsUz2TWwajJggcRE9r1zUYg==
+  dependencies:
+    "@noble/hashes" "~1.3.0"
+    "@scure/base" "~1.1.0"
+
 "@sentry/browser@7.37.2":
   version "7.37.2"
   resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-7.37.2.tgz#355dd28ad12677d63e0b12c5209d12b3f98ac3a4"
@@ -8620,6 +8655,13 @@
   dependencies:
     "@types/node" "*"
 
+"@types/ws@^8.5.5":
+  version "8.5.5"
+  resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.5.tgz#af587964aa06682702ee6dcbc7be41a80e4b28eb"
+  integrity sha512-lwhs8hktwxSjf9UaZ9tG5M03PGogvFaH8gUgLNbN9HKIg0dvv6q+gkSuJ8HN4/VbyxkuLzCjlN7GquQ0gUJfIg==
+  dependencies:
+    "@types/node" "*"
+
 "@types/yargs-parser@*":
   version "20.2.1"
   resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-20.2.1.tgz#3b9ce2489919d9e4fea439b76916abc34b2df129"
@@ -9141,24 +9183,24 @@
     "@walletconnect/types" "^1.8.0"
     "@walletconnect/utils" "^1.8.0"
 
-"@walletconnect/core@2.9.0":
-  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/@walletconnect/core/-/core-2.9.0.tgz#7837a5d015a22b48d35b987bcde2aa9ccdf300d8"
-  integrity sha512-MZYJghS9YCvGe32UOgDj0mCasaOoGHQaYXWeQblXE/xb8HuaM6kAWhjIQN9P+MNp5QP134BHP5olQostcCotXQ==
+"@walletconnect/core@2.10.1":
+  version "2.10.1"
+  resolved "https://registry.yarnpkg.com/@walletconnect/core/-/core-2.10.1.tgz#d1fb442bd77424666bacdb0f5a07f7708fb3d984"
+  integrity sha512-WAoXfmj+Zy5q48TnrKUjmHXJCBahzKwbul+noepRZf7JDtUAZ9IOWpUjg+UPRbfK5EiWZ0TF42S6SXidf7EHoQ==
   dependencies:
     "@walletconnect/heartbeat" "1.2.1"
     "@walletconnect/jsonrpc-provider" "1.0.13"
     "@walletconnect/jsonrpc-types" "1.0.3"
     "@walletconnect/jsonrpc-utils" "1.0.8"
-    "@walletconnect/jsonrpc-ws-connection" "1.0.12"
+    "@walletconnect/jsonrpc-ws-connection" "1.0.13"
     "@walletconnect/keyvaluestorage" "^1.0.2"
     "@walletconnect/logger" "^2.0.1"
     "@walletconnect/relay-api" "^1.0.9"
     "@walletconnect/relay-auth" "^1.0.4"
     "@walletconnect/safe-json" "^1.0.2"
     "@walletconnect/time" "^1.0.2"
-    "@walletconnect/types" "2.9.0"
-    "@walletconnect/utils" "2.9.0"
+    "@walletconnect/types" "2.10.1"
+    "@walletconnect/utils" "2.10.1"
     events "^3.3.0"
     lodash.isequal "4.5.0"
     uint8arrays "^3.1.0"
@@ -9200,19 +9242,19 @@
   dependencies:
     tslib "1.14.1"
 
-"@walletconnect/ethereum-provider@2.9.0":
-  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/@walletconnect/ethereum-provider/-/ethereum-provider-2.9.0.tgz#aa6e9e441678c824af8f744c50dafd604f19d69e"
-  integrity sha512-rSXkC0SXMigJRdIi/M2RMuEuATY1AwtlTWQBnqyxoht7xbO2bQNPCXn0XL4s/GRNrSUtoKSY4aPMHXV4W4yLBA==
+"@walletconnect/ethereum-provider@^2.10.0":
+  version "2.10.1"
+  resolved "https://registry.yarnpkg.com/@walletconnect/ethereum-provider/-/ethereum-provider-2.10.1.tgz#4733a98f0b388cf5ae6c2b269f50da87da432ee5"
+  integrity sha512-Yhoz8EXkKzxOlBT6G+elphqCx/gkH6RxD9/ZAiy9lLc8Ng5p1gvKCVVP5zsGNE9FbkKmHd+J9JJRzn2Bw2yqtQ==
   dependencies:
     "@walletconnect/jsonrpc-http-connection" "^1.0.7"
     "@walletconnect/jsonrpc-provider" "^1.0.13"
     "@walletconnect/jsonrpc-types" "^1.0.3"
     "@walletconnect/jsonrpc-utils" "^1.0.8"
-    "@walletconnect/sign-client" "2.9.0"
-    "@walletconnect/types" "2.9.0"
-    "@walletconnect/universal-provider" "2.9.0"
-    "@walletconnect/utils" "2.9.0"
+    "@walletconnect/sign-client" "2.10.1"
+    "@walletconnect/types" "2.10.1"
+    "@walletconnect/universal-provider" "2.10.1"
+    "@walletconnect/utils" "2.10.1"
     events "^3.3.0"
 
 "@walletconnect/events@^1.0.1":
@@ -9277,10 +9319,10 @@
     "@walletconnect/jsonrpc-types" "^1.0.3"
     tslib "1.14.1"
 
-"@walletconnect/jsonrpc-ws-connection@1.0.12":
-  version "1.0.12"
-  resolved "https://registry.yarnpkg.com/@walletconnect/jsonrpc-ws-connection/-/jsonrpc-ws-connection-1.0.12.tgz#2192314884fabdda6d0a9d22e157e5b352025ed8"
-  integrity sha512-HAcadga3Qjt1Cqy+qXEW6zjaCs8uJGdGQrqltzl3OjiK4epGZRdvSzTe63P+t/3z+D2wG+ffEPn0GVcDozmN1w==
+"@walletconnect/jsonrpc-ws-connection@1.0.13":
+  version "1.0.13"
+  resolved "https://registry.yarnpkg.com/@walletconnect/jsonrpc-ws-connection/-/jsonrpc-ws-connection-1.0.13.tgz#23b0cdd899801bfbb44a6556936ec2b93ef2adf4"
+  integrity sha512-mfOM7uFH4lGtQxG+XklYuFBj6dwVvseTt5/ahOkkmpcAEgz2umuzu7fTR+h5EmjQBdrmYyEBOWADbeaFNxdySg==
   dependencies:
     "@walletconnect/jsonrpc-utils" "^1.0.6"
     "@walletconnect/safe-json" "^1.0.2"
@@ -9309,31 +9351,30 @@
   resolved "https://registry.yarnpkg.com/@walletconnect/mobile-registry/-/mobile-registry-1.4.0.tgz#502cf8ab87330841d794819081e748ebdef7aee5"
   integrity sha512-ZtKRio4uCZ1JUF7LIdecmZt7FOLnX72RPSY7aUVu7mj7CSfxDwUn6gBuK6WGtH+NZCldBqDl5DenI5fFSvkKYw==
 
-"@walletconnect/modal-core@2.5.9":
-  version "2.5.9"
-  resolved "https://registry.yarnpkg.com/@walletconnect/modal-core/-/modal-core-2.5.9.tgz#45e0c25320d42855aaac39e6ba256a84f972b871"
-  integrity sha512-isIebwF9hOknGouhS/Ob4YJ9Sa/tqNYG2v6Ua9EkCqIoLimepkG5eC53tslUWW29SLSfQ9qqBNG2+iE7yQXqgw==
+"@walletconnect/modal-core@2.6.1":
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/@walletconnect/modal-core/-/modal-core-2.6.1.tgz#bc76055d0b644a2d4b98024324825c108a700905"
+  integrity sha512-f2hYlJ5pwzGvjyaZ6BoGR5uiMgXzWXt6w6ktt1N8lmY6PiYp8whZgqx2hTxVWwVlsGnaIfh6UHp1hGnANx0eTQ==
   dependencies:
-    buffer "6.0.3"
-    valtio "1.10.6"
+    valtio "1.11.0"
 
-"@walletconnect/modal-ui@2.5.9":
-  version "2.5.9"
-  resolved "https://registry.yarnpkg.com/@walletconnect/modal-ui/-/modal-ui-2.5.9.tgz#4d07f1697147ec9f75d85d93f564cadae05a5e59"
-  integrity sha512-nfBaAT9Ls7RZTBBgAq+Nt/3AoUcinIJ9bcq5UHXTV3lOPu/qCKmUC/0HY3GvUK8ykabUAsjr0OAGmcqkB91qug==
+"@walletconnect/modal-ui@2.6.1":
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/@walletconnect/modal-ui/-/modal-ui-2.6.1.tgz#200c54c8dfe3c71321abb2724e18bb357dfd6371"
+  integrity sha512-RFUOwDAMijSK8B7W3+KoLKaa1l+KEUG0LCrtHqaB0H0cLnhEGdLR+kdTdygw+W8+yYZbkM5tXBm7MlFbcuyitA==
   dependencies:
-    "@walletconnect/modal-core" "2.5.9"
-    lit "2.7.5"
+    "@walletconnect/modal-core" "2.6.1"
+    lit "2.7.6"
     motion "10.16.2"
     qrcode "1.5.3"
 
-"@walletconnect/modal@2.5.9":
-  version "2.5.9"
-  resolved "https://registry.yarnpkg.com/@walletconnect/modal/-/modal-2.5.9.tgz#28840f2a46bcd0a47c5fda60d18a5f1607a92a72"
-  integrity sha512-Zs2RvPwbBNRdBhb50FuJCxi3FJltt1KSpI7odjU/x9GTpTOcSOkmR66PBCy2JvNA0+ztnS1Xs0LVEr3lu7/Jzw==
+"@walletconnect/modal@2.6.1":
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/@walletconnect/modal/-/modal-2.6.1.tgz#066fdbfcff83b58c8a9da66ab4af0eb93e3626de"
+  integrity sha512-G84tSzdPKAFk1zimgV7JzIUFT5olZUVtI3GcOk77OeLYjlMfnDT23RVRHm5EyCrjkptnvpD0wQScXePOFd2Xcw==
   dependencies:
-    "@walletconnect/modal-core" "2.5.9"
-    "@walletconnect/modal-ui" "2.5.9"
+    "@walletconnect/modal-core" "2.6.1"
+    "@walletconnect/modal-ui" "2.6.1"
 
 "@walletconnect/qrcode-modal@^1.8.0":
   version "1.8.0"
@@ -9389,19 +9430,19 @@
   dependencies:
     tslib "1.14.1"
 
-"@walletconnect/sign-client@2.9.0":
-  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/@walletconnect/sign-client/-/sign-client-2.9.0.tgz#fd3b0acb68bc8d56350f01ed70f8c6326e6e89fa"
-  integrity sha512-mEKc4LlLMebCe45qzqh+MX4ilQK4kOEBzLY6YJpG8EhyT45eX4JMNA7qQoYa9MRMaaVb/7USJcc4e3ZrjZvQmA==
+"@walletconnect/sign-client@2.10.1":
+  version "2.10.1"
+  resolved "https://registry.yarnpkg.com/@walletconnect/sign-client/-/sign-client-2.10.1.tgz#db60bc9400cd79f0cb2380067343512b21ee4749"
+  integrity sha512-iG3eJGi1yXeG3xGeVSSMf8wDFyx239B0prLQfy1uYDtYFb2ynnH/09oqAZyKn96W5nfQzUgM2Mz157PVdloH3Q==
   dependencies:
-    "@walletconnect/core" "2.9.0"
+    "@walletconnect/core" "2.10.1"
     "@walletconnect/events" "^1.0.1"
     "@walletconnect/heartbeat" "1.2.1"
     "@walletconnect/jsonrpc-utils" "1.0.8"
     "@walletconnect/logger" "^2.0.1"
     "@walletconnect/time" "^1.0.2"
-    "@walletconnect/types" "2.9.0"
-    "@walletconnect/utils" "2.9.0"
+    "@walletconnect/types" "2.10.1"
+    "@walletconnect/utils" "2.10.1"
     events "^3.3.0"
 
 "@walletconnect/socket-transport@^1.8.0":
@@ -9420,10 +9461,10 @@
   dependencies:
     tslib "1.14.1"
 
-"@walletconnect/types@2.9.0":
-  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/@walletconnect/types/-/types-2.9.0.tgz#6e5dfdc7212c1ec4ab49a1ec409c743e16093f72"
-  integrity sha512-ORopsMfSRvUYqtjKKd6scfg8o4/aGebipLxx92AuuUgMTERSU6cGmIrK6rdLu7W6FBJkmngPLEGc9mRqAb9Lug==
+"@walletconnect/types@2.10.1":
+  version "2.10.1"
+  resolved "https://registry.yarnpkg.com/@walletconnect/types/-/types-2.10.1.tgz#1355bce236f3eef575716ea3efe4beed98a873ef"
+  integrity sha512-7pccAhajQdiH2kYywjE1XI64IqRI+4ioyGy0wvz8d0UFQ/DSG3MLKR8jHf5aTOafQQ/HRLz6xvlzN4a7gIVkUQ==
   dependencies:
     "@walletconnect/events" "^1.0.1"
     "@walletconnect/heartbeat" "1.2.1"
@@ -9437,25 +9478,25 @@
   resolved "https://registry.yarnpkg.com/@walletconnect/types/-/types-1.8.0.tgz#3f5e85b2d6b149337f727ab8a71b8471d8d9a195"
   integrity sha512-Cn+3I0V0vT9ghMuzh1KzZvCkiAxTq+1TR2eSqw5E5AVWfmCtECFkVZBP6uUJZ8YjwLqXheI+rnjqPy7sVM4Fyg==
 
-"@walletconnect/universal-provider@2.9.0":
-  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/@walletconnect/universal-provider/-/universal-provider-2.9.0.tgz#a6b4a1f099262536e17b5c25bf7b3c89db9945a8"
-  integrity sha512-k3nkSBkF69sJJVoe17IVoPtnhp/sgaa2t+x7BvA/BKeMxE0DGdtRJdEXotTc8DBmI7o2tkq6l8+HyFBGjQ/CjQ==
+"@walletconnect/universal-provider@2.10.1":
+  version "2.10.1"
+  resolved "https://registry.yarnpkg.com/@walletconnect/universal-provider/-/universal-provider-2.10.1.tgz#c4a77bd2eed1a335edae5b2b298636092fff63ef"
+  integrity sha512-81QxTH/X4dRoYCz0U9iOrBYOcj7N897ONcB57wsGhEkV7Rc9htmWJq2CzeOuxvVZ+pNZkE+/aw9LrhizO1Ltxg==
   dependencies:
     "@walletconnect/jsonrpc-http-connection" "^1.0.7"
     "@walletconnect/jsonrpc-provider" "1.0.13"
     "@walletconnect/jsonrpc-types" "^1.0.2"
     "@walletconnect/jsonrpc-utils" "^1.0.7"
     "@walletconnect/logger" "^2.0.1"
-    "@walletconnect/sign-client" "2.9.0"
-    "@walletconnect/types" "2.9.0"
-    "@walletconnect/utils" "2.9.0"
+    "@walletconnect/sign-client" "2.10.1"
+    "@walletconnect/types" "2.10.1"
+    "@walletconnect/utils" "2.10.1"
     events "^3.3.0"
 
-"@walletconnect/utils@2.9.0":
-  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/@walletconnect/utils/-/utils-2.9.0.tgz#c73925edb9fefe79021bcf028e957028f986b728"
-  integrity sha512-7Tu3m6dZL84KofrNBcblsgpSqU2vdo9ImLD7zWimLXERVGNQ8smXG+gmhQYblebIBhsPzjy9N38YMC3nPlfQNw==
+"@walletconnect/utils@2.10.1":
+  version "2.10.1"
+  resolved "https://registry.yarnpkg.com/@walletconnect/utils/-/utils-2.10.1.tgz#65b37c9800eb0e80a08385b6987471fb46e1e22e"
+  integrity sha512-DM0dKgm9O58l7VqJEyV2OVv16XRePhDAReI23let6WdW1dSpw/Y/A89Lp99ZJOjLm2FxyblMRF3YRaZtHwBffw==
   dependencies:
     "@stablelib/chacha20poly1305" "1.0.1"
     "@stablelib/hkdf" "1.0.1"
@@ -9465,7 +9506,7 @@
     "@walletconnect/relay-api" "^1.0.9"
     "@walletconnect/safe-json" "^1.0.2"
     "@walletconnect/time" "^1.0.2"
-    "@walletconnect/types" "2.9.0"
+    "@walletconnect/types" "2.10.1"
     "@walletconnect/window-getters" "^1.0.1"
     "@walletconnect/window-metadata" "^1.0.1"
     detect-browser "5.3.0"
@@ -9512,12 +9553,12 @@
     "@walletconnect/window-getters" "^1.0.1"
     tslib "1.14.1"
 
-"@web3-onboard/coinbase@^2.2.4":
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/@web3-onboard/coinbase/-/coinbase-2.2.4.tgz#7e7f82e631816ab7ddcab8d94df6d1513baada50"
-  integrity sha512-XnQejTC51ZqYm4sT+RH3tr1yWcbuZXTWXRZeIHEWiJchVBE4K9goPxhB03PX8ZQ9TDt/bUTEkl7Qfyp6bhKTKw==
+"@web3-onboard/coinbase@^2.2.5":
+  version "2.2.5"
+  resolved "https://registry.yarnpkg.com/@web3-onboard/coinbase/-/coinbase-2.2.5.tgz#fb7a57e5456323c0ee107ce48ea0cc80acbb6e07"
+  integrity sha512-mEiaK+K+nB2TwxUpkyAZmb4AHguymsJrHFbsZDdAolFTgZizCSjGHBhYlCEfxLL4fh3CpUryTa/AaNxxhdG6OQ==
   dependencies:
-    "@coinbase/wallet-sdk" "^3.6.0"
+    "@coinbase/wallet-sdk" "^3.7.1"
     "@web3-onboard/common" "^2.3.3"
 
 "@web3-onboard/common@^2.3.3":
@@ -9529,10 +9570,10 @@
     ethers "5.5.4"
     joi "17.9.1"
 
-"@web3-onboard/core@^2.20.4":
-  version "2.20.4"
-  resolved "https://registry.yarnpkg.com/@web3-onboard/core/-/core-2.20.4.tgz#ccc9ff509e56720e526b4ceae5459a1f2a435d22"
-  integrity sha512-IFI3DVq5QgFj5w1TyL61gHmeOlkX8AJiBAARO3cd4zW8I3h9K2+7HeE7LbsfwefZYLILzXCfF0gMB3qRN/GWYQ==
+"@web3-onboard/core@^2.21.2":
+  version "2.21.2"
+  resolved "https://registry.yarnpkg.com/@web3-onboard/core/-/core-2.21.2.tgz#962683efc87b29ee9150ab8d7ea9568ea3b41dd5"
+  integrity sha512-apzVi2zWqs4ktZBBJ60x1e4odI1mSoZ2c69bXUg36A0xI0iRFQ9Od44peI3mfTDEru7hWsr81Nv6l+v3HRSKLw==
   dependencies:
     "@web3-onboard/common" "^2.3.3"
     bignumber.js "^9.0.0"
@@ -9548,44 +9589,43 @@
     svelte "^3.49.0"
     svelte-i18n "^3.3.13"
 
-"@web3-onboard/gnosis@^2.1.10":
-  version "2.1.10"
-  resolved "https://registry.yarnpkg.com/@web3-onboard/gnosis/-/gnosis-2.1.10.tgz#ca62d23780749a9e69d96b4480c7d79c81d80211"
-  integrity sha512-rUrRPdyDxeq/DRqsCPZ75JH0TcnETfeclVwUnam31DeFGtBFbOXYhHhCXnjWcQYFxqdNBaqoZuMfjrvTi+NC2g==
+"@web3-onboard/gnosis@^2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@web3-onboard/gnosis/-/gnosis-2.2.0.tgz#134dd79d13b651934f4233760f4337752d1c35df"
+  integrity sha512-+CtvrI30jj3zJdplQfrCU1rSAUN6R0rfBZggl8JXvqsH5CNTFjU3ctVWeqbyGBPfcVhRQ5oLqKcj464LTwy2iw==
   dependencies:
-    "@gnosis.pm/safe-apps-provider" "^0.9.2"
-    "@gnosis.pm/safe-apps-sdk" "^6.1.1"
     "@web3-onboard/common" "^2.3.3"
 
-"@web3-onboard/injected-wallets@^2.10.2":
-  version "2.10.2"
-  resolved "https://registry.yarnpkg.com/@web3-onboard/injected-wallets/-/injected-wallets-2.10.2.tgz#e84eabebdb888dcec4a7a48f02fafa788735e791"
-  integrity sha512-LFQ/bBfhvSfzB5Y9gB37mtyKmUz76tdZIfUvBhhnmmxLCuD1T4eFsjMo67cRdC6wcXRTMbCaPbldGqz/10b0ug==
+"@web3-onboard/injected-wallets@^2.10.6":
+  version "2.10.6"
+  resolved "https://registry.yarnpkg.com/@web3-onboard/injected-wallets/-/injected-wallets-2.10.6.tgz#8ba357e176f3261d57204742e2ee2ca683592784"
+  integrity sha512-/3mp+0ML478JuUXF0D1m5Nq83HMkfpdd8BcJJ//qN0Laxi+I2obquT47pcqbkRTwNAxpjzlpprjhN6V78bCF3g==
   dependencies:
     "@web3-onboard/common" "^2.3.3"
     joi "17.9.1"
     lodash.uniqby "^4.7.0"
 
-"@web3-onboard/react@^2.8.9":
-  version "2.8.9"
-  resolved "https://registry.yarnpkg.com/@web3-onboard/react/-/react-2.8.9.tgz#e64b5067d490b22d3a4566fb7c8d71d7b1787703"
-  integrity sha512-Ih2PJhyTEpiW9wQbli+ZYqU8qkWqgR3PYmT2teHdDiaDaF8nPBvztBPPZkLjZSyx67iLsOBqS4kw8n74BK7DQw==
+"@web3-onboard/react@^2.8.13":
+  version "2.8.13"
+  resolved "https://registry.yarnpkg.com/@web3-onboard/react/-/react-2.8.13.tgz#c58fae9ba73f343aaa4483d57b6b27b1b14d1851"
+  integrity sha512-RhdnbVNWxYrMFOwxZKRKV3ys7SKymdHa2cHsyzcVEQlHzZVhZVlKB6KWzvk6umcyuT4DF9W4edzd1clJwCmazg==
   dependencies:
     "@web3-onboard/common" "^2.3.3"
-    "@web3-onboard/core" "^2.20.4"
+    "@web3-onboard/core" "^2.21.2"
     use-sync-external-store "1.0.0"
 
-"@web3-onboard/walletconnect@^2.4.1":
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/@web3-onboard/walletconnect/-/walletconnect-2.4.1.tgz#49e6699b89790b17fc702cf21f24df71ec0d7c17"
-  integrity sha512-REYvE+VQgCo3zMAb4q9W0cmyrLH7xAEB3oi2lUwXcfejvk6TMT7xl6dVLWpycyGfQWLXS2HM0YGQ1zhFyBkLIQ==
+"@web3-onboard/walletconnect@^2.4.6":
+  version "2.4.6"
+  resolved "https://registry.yarnpkg.com/@web3-onboard/walletconnect/-/walletconnect-2.4.6.tgz#305b16a022f915356fd8b7547c89858bbd10498c"
+  integrity sha512-HsJHC++1/RSZIbYWGLCKkkmdu+8ITV3hkBeSQxvrnO9bcCBMY//+SBo2N7hPZqqSiRFvv2/UW4r4hELmhR4pdQ==
   dependencies:
     "@ethersproject/providers" "5.5.0"
     "@walletconnect/client" "^1.8.0"
-    "@walletconnect/ethereum-provider" "2.9.0"
-    "@walletconnect/modal" "2.5.9"
+    "@walletconnect/ethereum-provider" "^2.10.0"
+    "@walletconnect/modal" "2.6.1"
     "@walletconnect/qrcode-modal" "^1.8.0"
     "@web3-onboard/common" "^2.3.3"
+    joi "17.9.1"
     rxjs "^7.5.2"
 
 "@webassemblyjs/ast@1.11.1":
@@ -10001,6 +10041,11 @@ abbrev@1.0.x:
     web3-eth-abi "^1.2.1"
     web3-utils "^1.2.1"
 
+abitype@0.9.8:
+  version "0.9.8"
+  resolved "https://registry.yarnpkg.com/abitype/-/abitype-0.9.8.tgz#1f120b6b717459deafd213dfbf3a3dd1bf10ae8c"
+  integrity sha512-puLifILdm+8sjyss4S+fsUN09obiT1g2YW6CtcQF+QDzxR0euzgEB29MZujC6zMk2a6SVmtttq1fc6+YFA7WYQ==
+
 abort-controller@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392"
@@ -13775,7 +13820,7 @@ cross-fetch@^2.1.0, cross-fetch@^2.1.1:
     node-fetch "^2.6.7"
     whatwg-fetch "^2.0.4"
 
-cross-fetch@^3.0.6, cross-fetch@^3.1.4, cross-fetch@^3.1.5:
+cross-fetch@^3.0.6, cross-fetch@^3.1.4:
   version "3.1.5"
   resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.5.tgz#e1389f44d9e7ba767907f7af8454787952ab534f"
   integrity sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==
@@ -16112,7 +16157,7 @@ ethers@5.5.4:
     "@ethersproject/web" "5.5.1"
     "@ethersproject/wordlists" "5.5.0"
 
-ethers@5.7.2, ethers@^5.0.13, ethers@^5.4.2, ethers@^5.4.7, ethers@^5.5.4, ethers@^5.6.8, ethers@^5.7.0, ethers@^5.7.1, ethers@^5.7.2:
+ethers@5.7.2, ethers@^5.0.13, ethers@^5.4.2, ethers@^5.5.4, ethers@^5.6.8, ethers@^5.7.0, ethers@^5.7.1, ethers@^5.7.2:
   version "5.7.2"
   resolved "https://registry.yarnpkg.com/ethers/-/ethers-5.7.2.tgz#3a7deeabbb8c030d4126b24f84e525466145872e"
   integrity sha512-wswUsmWo1aOK8rR7DIKiWSw9DbLWe6x98Jrn8wcTflTVvaXhAMaB5zGAXy0GYQEQp9iO1iSHWVyARQm11zUtyg==
@@ -19499,6 +19544,11 @@ isomorphic-unfetch@^3.1.0:
     node-fetch "^2.6.1"
     unfetch "^4.2.0"
 
+isomorphic-ws@5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/isomorphic-ws/-/isomorphic-ws-5.0.0.tgz#e5529148912ecb9b451b46ed44d53dae1ce04bbf"
+  integrity sha512-muId7Zzn9ywDsyXgTIafTry2sV3nySZeUDe6YedVd1Hvuuep5AsIlqK+XefWpYTyJG5e503F2xIuT2lcU6rCSw==
+
 isomorphic-ws@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/isomorphic-ws/-/isomorphic-ws-4.0.1.tgz#55fd4cd6c5e6491e76dc125938dd863f5cd4f2dc"
@@ -20912,10 +20962,10 @@ lit-html@^2.7.0:
   dependencies:
     "@types/trusted-types" "^2.0.2"
 
-lit@2.7.5:
-  version "2.7.5"
-  resolved "https://registry.yarnpkg.com/lit/-/lit-2.7.5.tgz#60bc82990cfad169d42cd786999356dcf79b035f"
-  integrity sha512-i/cH7Ye6nBDUASMnfwcictBnsTN91+aBjXoTHF2xARghXScKxpD4F4WYI+VLXg9lqbMinDfvoI7VnZXjyHgdfQ==
+lit@2.7.6:
+  version "2.7.6"
+  resolved "https://registry.yarnpkg.com/lit/-/lit-2.7.6.tgz#810007b876ed43e0c70124de91831921598b1665"
+  integrity sha512-1amFHA7t4VaaDe+vdQejSVBklwtH9svGoG6/dZi9JhxtJBBlqY5D1RV7iLUYY0trCqQc4NfhYYZilZiVHt7Hxg==
   dependencies:
     "@lit/reactive-element" "^1.6.0"
     lit-element "^3.3.0"
@@ -27749,6 +27799,11 @@ tslib@^2.0.0, tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.0, tslib@^2.3
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.1.tgz#0d0bfbaac2880b91e22df0768e55be9753a5b17e"
   integrity sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==
 
+tslib@^2.6.2:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae"
+  integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==
+
 tsort@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/tsort/-/tsort-0.0.1.tgz#e2280f5e817f8bf4275657fd0f9aebd44f5a2786"
@@ -28427,10 +28482,10 @@ validate-npm-package-license@^3.0.1:
     spdx-correct "^3.0.0"
     spdx-expression-parse "^3.0.0"
 
-valtio@1.10.6:
-  version "1.10.6"
-  resolved "https://registry.yarnpkg.com/valtio/-/valtio-1.10.6.tgz#80ed00198b949939863a0fa56ae687abb417fc4f"
-  integrity sha512-SxN1bHUmdhW6V8qsQTpCgJEwp7uHbntuH0S9cdLQtiohuevwBksbpXjwj5uDMA7bLwg1WKyq9sEpZrx3TIMrkA==
+valtio@1.11.0:
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/valtio/-/valtio-1.11.0.tgz#c029dcd17a0f99d2fbec933721fe64cfd32a31ed"
+  integrity sha512-65Yd0yU5qs86b5lN1eu/nzcTgQ9/6YnD6iO+DDaDbQLn1Zv2w12Gwk43WkPlUBxk5wL/6cD5YMFf7kj6HZ1Kpg==
   dependencies:
     proxy-compare "2.5.1"
     use-sync-external-store "1.2.0"
@@ -28487,6 +28542,21 @@ vfile@^4.0.0:
     unist-util-stringify-position "^2.0.0"
     vfile-message "^2.0.0"
 
+viem@^1.0.0:
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/viem/-/viem-1.11.1.tgz#30531740eb52e5d1ff1167d8df462d1a8d45afb8"
+  integrity sha512-PPNsPacRS7nryakQQJ9PjYGjUa0QgV8lbERhRuJm8X4kGUzSAsTQaQmy4hvV0cRAEHg8tG0TMD+GTCfwzZM3Yw==
+  dependencies:
+    "@adraffy/ens-normalize" "1.9.4"
+    "@noble/curves" "1.2.0"
+    "@noble/hashes" "1.3.2"
+    "@scure/bip32" "1.3.2"
+    "@scure/bip39" "1.2.1"
+    "@types/ws" "^8.5.5"
+    abitype "0.9.8"
+    isomorphic-ws "5.0.0"
+    ws "8.13.0"
+
 vite-plugin-environment@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/vite-plugin-environment/-/vite-plugin-environment-1.1.3.tgz#d01a04abb2f69730a4866c9c9db51d3dab74645b"
@@ -29724,6 +29794,11 @@ ws@7.5.3:
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.3.tgz#160835b63c7d97bfab418fc1b8a9fced2ac01a74"
   integrity sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg==
 
+ws@8.13.0, ws@^8.11.0:
+  version "8.13.0"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.13.0.tgz#9a9fb92f93cf41512a0735c8f4dd09b8a1211cd0"
+  integrity sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==
+
 ws@^3.0.0:
   version "3.3.3"
   resolved "https://registry.yarnpkg.com/ws/-/ws-3.3.3.tgz#f1cf84fe2d5e901ebce94efaece785f187a228f2"
@@ -29745,11 +29820,6 @@ ws@^7.3.1, ws@^7.4.5, ws@^7.4.6, ws@^7.5.1:
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591"
   integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==
 
-ws@^8.11.0:
-  version "8.13.0"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.13.0.tgz#9a9fb92f93cf41512a0735c8f4dd09b8a1211cd0"
-  integrity sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==
-
 ws@^8.2.3, ws@^8.5.0:
   version "8.8.1"
   resolved "https://registry.yarnpkg.com/ws/-/ws-8.8.1.tgz#5dbad0feb7ade8ecc99b830c1d77c913d4955ff0"